Remove ‘evict storage provider’ proposal.

Cargo.lock

@@ -5131,7 +5131,6 @@ dependencies = [
  "substrate-proposals-discussion-module",
  "substrate-proposals-engine-module",
  "substrate-recurring-reward-module",
- "substrate-roles-module",
  "substrate-stake-module",
  "substrate-token-mint-module",
  "substrate-versioned-store",

node/src/chain_spec.rs

@@ -324,10 +324,6 @@ pub fn testnet_genesis(
             set_lead_proposal_grace_period: cpcp.set_lead_proposal_voting_period,
             spending_proposal_voting_period: cpcp.spending_proposal_voting_period,
             spending_proposal_grace_period: cpcp.spending_proposal_grace_period,
-            evict_storage_provider_proposal_voting_period: cpcp
-                .evict_storage_provider_proposal_voting_period,
-            evict_storage_provider_proposal_grace_period: cpcp
-                .evict_storage_provider_proposal_grace_period,
         }),
     }
 }

runtime-modules/proposals/codex/Cargo.toml

@@ -24,7 +24,6 @@ std = [
     'membership/std',
     'governance/std',
     'mint/std',
-    'roles/std',
     'common/std',
     'content_working_group/std',
 ]
@@ -133,11 +132,6 @@ default_features = false
 package = 'substrate-content-working-group-module'
 path = '../../content-working-group'
 
-[dependencies.roles]
-default_features = false
-package = 'substrate-roles-module'
-path = '../../roles'
-
 [dev-dependencies.hiring]
 default_features = false
 package = 'substrate-hiring-module'

runtime-modules/proposals/codex/src/lib.rs

@@ -19,7 +19,6 @@
 //! - [create_set_content_working_group_mint_capacity_proposal](./struct.Module.html#method.create_set_content_working_group_mint_capacity_proposal)
 //! - [create_spending_proposal](./struct.Module.html#method.create_spending_proposal)
 //! - [create_set_lead_proposal](./struct.Module.html#method.create_set_lead_proposal)
-//! - [create_evict_storage_provider_proposal](./struct.Module.html#method.create_evict_storage_provider_proposal)
 //! - [create_set_validator_count_proposal](./struct.Module.html#method.create_set_validator_count_proposal)
 //!
 //! ### Proposal implementations of this module
@@ -118,7 +117,6 @@ pub trait Trait:
     + membership::members::Trait
     + governance::election::Trait
     + content_working_group::Trait
-    + roles::actors::Trait
     + staking::Trait
 {
     /// Defines max allowed text proposal length.
@@ -315,14 +313,6 @@ decl_storage! {
 
         /// Grace period for the 'spending' proposal
         pub SpendingProposalGracePeriod get(spending_proposal_grace_period) config(): T::BlockNumber;
-
-        /// Voting period for the 'evict storage provider' proposal
-        pub EvictStorageProviderProposalVotingPeriod get(evict_storage_provider_proposal_voting_period)
-            config(): T::BlockNumber;
-
-        /// Grace period for the 'evict storage provider' proposal
-        pub EvictStorageProviderProposalGracePeriod get(evict_storage_provider_proposal_grace_period)
-            config(): T::BlockNumber;
     }
 }
 
@@ -529,33 +519,6 @@ decl_module! {
             )?;
         }
 
-        /// Create 'Evict storage provider' proposal type.
-        /// This proposal uses `remove_actor()` extrinsic from the `roles::actors`  module.
-        pub fn create_evict_storage_provider_proposal(
-            origin,
-            member_id: MemberId<T>,
-            title: Vec<u8>,
-            description: Vec<u8>,
-            stake_balance: Option<BalanceOf<T>>,
-            actor_account: T::AccountId,
-        ) {
-            let proposal_parameters =
-                proposal_types::parameters::evict_storage_provider_proposal::<T>();
-            let proposal_details = ProposalDetails::EvictStorageProvider(actor_account);
-            let proposal_code = T::ProposalEncoder::encode_proposal(proposal_details.clone());
-
-            Self::create_proposal(
-                origin,
-                member_id,
-                title,
-                description,
-                stake_balance,
-                proposal_code,
-                proposal_parameters,
-                proposal_details,
-            )?;
-        }
-
         /// Create 'Evict storage provider' proposal type.
         /// This proposal uses `set_validator_count()` extrinsic from the Substrate `staking`  module.
         pub fn create_set_validator_count_proposal(
@@ -839,11 +802,5 @@ impl<T: Trait> Module<T> {
         <SpendingProposalGracePeriod<T>>::put(T::BlockNumber::from(
             p.spending_proposal_grace_period,
         ));
-        <EvictStorageProviderProposalVotingPeriod<T>>::put(T::BlockNumber::from(
-            p.evict_storage_provider_proposal_voting_period,
-        ));
-        <EvictStorageProviderProposalGracePeriod<T>>::put(T::BlockNumber::from(
-            p.evict_storage_provider_proposal_grace_period,
-        ));
     }
 }

runtime-modules/proposals/codex/src/proposal_types/mod.rs

@@ -46,9 +46,6 @@ pub enum ProposalDetails<MintedBalance, CurrencyBalance, BlockNumber, AccountId,
     /// Balance for the `set content working group mint capacity` proposal
     SetContentWorkingGroupMintCapacity(MintedBalance),
 
-    /// AccountId for the `evict storage provider` proposal
-    EvictStorageProvider(AccountId),
-
     /// Validator count for the `set validator count` proposal
     SetValidatorCount(u32),
 }
@@ -104,12 +101,6 @@ pub struct ProposalsConfigParameters {
 
     /// 'Spending' proposal grace period
     pub spending_proposal_grace_period: u32,
-
-    /// 'Evict storage provider' proposal voting period
-    pub evict_storage_provider_proposal_voting_period: u32,
-
-    /// 'Evict storage provider' proposal grace period
-    pub evict_storage_provider_proposal_grace_period: u32,
 }
 
 impl Default for ProposalsConfigParameters {
@@ -129,8 +120,6 @@ impl Default for ProposalsConfigParameters {
             set_lead_proposal_grace_period: 0u32,
             spending_proposal_voting_period: 72000u32,
             spending_proposal_grace_period: 14400u32,
-            evict_storage_provider_proposal_voting_period: 43200u32,
-            evict_storage_provider_proposal_grace_period: 0u32,
         }
     }
 }

runtime-modules/proposals/codex/src/proposal_types/parameters.rs

@@ -97,17 +97,3 @@ pub(crate) fn set_lead_proposal<T: crate::Trait>(
         required_stake: Some(<BalanceOf<T>>::from(50000u32)),
     }
 }
-
-// Proposal parameters for the 'Evict storage provider' proposal
-pub(crate) fn evict_storage_provider_proposal<T: crate::Trait>(
-) -> ProposalParameters<T::BlockNumber, BalanceOf<T>> {
-    ProposalParameters {
-        voting_period: <Module<T>>::evict_storage_provider_proposal_voting_period(),
-        grace_period: <Module<T>>::evict_storage_provider_proposal_grace_period(),
-        approval_quorum_percentage: 50,
-        approval_threshold_percentage: 75,
-        slashing_quorum_percentage: 60,
-        slashing_threshold_percentage: 80,
-        required_stake: Some(<BalanceOf<T>>::from(25000u32)),
-    }
-}

runtime-modules/proposals/codex/src/tests/mock.rs

@@ -193,15 +193,6 @@ impl hiring::Trait for Test {
     type StakeHandlerProvider = hiring::Module<Self>;
 }
 
-impl roles::actors::Trait for Test {
-    type Event = ();
-    type OnActorRemoved = ();
-}
-
-impl roles::actors::ActorRemoved<Test> for () {
-    fn actor_removed(_: &u64) {}
-}
-
 srml_staking_reward_curve::build! {
     const I_NPOS: PiecewiseLinear<'static> = curve!(
         min_inflation: 0_025_000,

runtime-modules/proposals/codex/src/tests/mod.rs

@@ -706,59 +706,6 @@ fn create_set_lead_proposal_common_checks_succeed() {
     });
 }
 
-#[test]
-fn create_evict_storage_provider_proposal_common_checks_succeed() {
-    initial_test_ext().execute_with(|| {
-        increase_total_balance_issuance(500000);
-
-        let proposal_fixture = ProposalTestFixture {
-            insufficient_rights_call: || {
-                ProposalCodex::create_evict_storage_provider_proposal(
-                    RawOrigin::None.into(),
-                    1,
-                    b"title".to_vec(),
-                    b"body".to_vec(),
-                    None,
-                    1,
-                )
-            },
-            empty_stake_call: || {
-                ProposalCodex::create_evict_storage_provider_proposal(
-                    RawOrigin::Signed(1).into(),
-                    1,
-                    b"title".to_vec(),
-                    b"body".to_vec(),
-                    None,
-                    1,
-                )
-            },
-            invalid_stake_call: || {
-                ProposalCodex::create_evict_storage_provider_proposal(
-                    RawOrigin::Signed(1).into(),
-                    1,
-                    b"title".to_vec(),
-                    b"body".to_vec(),
-                    Some(<BalanceOf<Test>>::from(5000u32)),
-                    1,
-                )
-            },
-            successful_call: || {
-                ProposalCodex::create_evict_storage_provider_proposal(
-                    RawOrigin::Signed(1).into(),
-                    1,
-                    b"title".to_vec(),
-                    b"body".to_vec(),
-                    Some(<BalanceOf<Test>>::from(25000u32)),
-                    1,
-                )
-            },
-            proposal_parameters: crate::proposal_types::parameters::evict_storage_provider_proposal::<Test>(),
-            proposal_details: ProposalDetails::EvictStorageProvider(1),
-        };
-        proposal_fixture.check_all();
-    });
-}
-
 #[test]
 fn create_set_validator_count_proposal_common_checks_succeed() {
     initial_test_ext().execute_with(|| {
@@ -909,13 +856,5 @@ fn set_default_proposal_parameters_succeeded() {
             <SpendingProposalGracePeriod<Test>>::get(),
             p.spending_proposal_grace_period as u64
         );
-        assert_eq!(
-            <EvictStorageProviderProposalVotingPeriod<Test>>::get(),
-            p.evict_storage_provider_proposal_voting_period as u64
-        );
-        assert_eq!(
-            <EvictStorageProviderProposalGracePeriod<Test>>::get(),
-            p.evict_storage_provider_proposal_grace_period as u64
-        );
     });
 }

runtime/src/integration/proposals/proposal_encoder.rs

@@ -31,9 +31,6 @@ impl ProposalEncoder<Runtime> for ExtrinsicProposalEncoder {
                 Call::ContentWorkingGroup(content_working_group::Call::replace_lead(new_lead))
                     .encode()
             }
-            ProposalDetails::EvictStorageProvider(actor_account) => {
-                Call::Actors(roles::actors::Call::remove_actor(actor_account)).encode()
-            }
             ProposalDetails::SetValidatorCount(new_validator_count) => {
                 Call::Staking(staking::Call::set_validator_count(new_validator_count)).encode()
             }

runtime/src/tests/proposals_integration.rs

@@ -6,18 +6,16 @@ use crate::{BlockNumber, ElectionParameters, ProposalCancellationFee, Runtime};
 use codec::Encode;
 use governance::election::CouncilElected;
 use membership::members;
-use membership::role_types::Role;
 use proposals_engine::{
     ActiveStake, ApprovedProposalStatus, BalanceOf, Error, FinalizationData, Proposal,
     ProposalDecisionStatus, ProposalParameters, ProposalStatus, VoteKind, VotersParameters,
     VotingResults,
 };
-use roles::actors::RoleParameters;
 
 use sr_primitives::traits::{DispatchResult, OnFinalize, OnInitialize};
 use sr_primitives::AccountId32;
 use srml_support::traits::Currency;
-use srml_support::{StorageLinkedMap, StorageMap, StorageValue};
+use srml_support::{StorageLinkedMap, StorageValue};
 use system::RawOrigin;
 
 use super::initial_test_ext;
@@ -604,58 +602,6 @@ fn set_election_parameters_proposal_execution_succeeds() {
     });
 }
 
-#[test]
-fn evict_storage_provider_proposal_execution_succeeds() {
-    initial_test_ext().execute_with(|| {
-        let member_id = 1;
-        let account_id: [u8; 32] = [member_id; 32];
-
-        let target_member_id = 3;
-        let target_account: [u8; 32] = [target_member_id; 32];
-        let target_account_id: AccountId32 = target_account.into();
-
-        <roles::actors::Parameters<Runtime>>::insert(
-            Role::StorageProvider,
-            roles::actors::RoleParameters::default(),
-        );
-
-        <roles::actors::AccountIdsByRole<Runtime>>::insert(
-            Role::StorageProvider,
-            vec![target_account_id.clone()],
-        );
-
-        <roles::actors::ActorByAccountId<Runtime>>::insert(
-            target_account_id.clone(),
-            roles::actors::Actor {
-                member_id: target_member_id as u64,
-                role: Role::StorageProvider,
-                account: target_account_id,
-                joined_at: 1,
-            },
-        );
-
-        let codex_extrinsic_test_fixture = CodexProposalTestFixture {
-            member_id: member_id as u64,
-            successful_call: || {
-                ProposalCodex::create_evict_storage_provider_proposal(
-                    RawOrigin::Signed(account_id.clone().into()).into(),
-                    member_id as u64,
-                    b"title".to_vec(),
-                    b"body".to_vec(),
-                    Some(<BalanceOf<Runtime>>::from(25000u32)),
-                    target_account.into(),
-                )
-            },
-        };
-        codex_extrinsic_test_fixture.call_extrinsic_and_assert();
-
-        assert_eq!(
-            <roles::actors::AccountIdsByRole<Runtime>>::get(Role::StorageProvider),
-            Vec::new()
-        );
-    });
-}
-
 #[test]
 fn set_validator_count_proposal_execution_succeeds() {
     initial_test_ext().execute_with(|| {