Merge pull request #1874 from shamil-gadelshin/remove_old_proposal_parameters

Remove old proposal parameters.

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

@@ -145,11 +145,6 @@ pub trait Trait:
         ProposalParameters<Self::BlockNumber, BalanceOf<Self>>,
     >;
 
-    /// 'Begin review working group applications' proposal parameters.
-    type BeginReviewWorkingGroupApplicationsProposalParameters: Get<
-        ProposalParameters<Self::BlockNumber, BalanceOf<Self>>,
-    >;
-
     /// 'Fill working group opening' proposal parameters.
     type FillWorkingGroupOpeningProposalParameters: Get<
         ProposalParameters<Self::BlockNumber, BalanceOf<Self>>,
@@ -298,10 +293,6 @@ decl_module! {
         const AddWorkingGroupOpeningProposalParameters: ProposalParameters<T::BlockNumber, BalanceOf<T>>
             = T::AddWorkingGroupOpeningProposalParameters::get();
 
-        /// Exports 'Begin review working group applications' proposal parameters.
-        const BeginReviewWorkingGroupApplicationsProposalParameters: ProposalParameters<T::BlockNumber, BalanceOf<T>>
-            = T::BeginReviewWorkingGroupApplicationsProposalParameters::get();
-
         /// Exports 'Fill working group opening' proposal parameters.
         const FillWorkingGroupOpeningProposalParameters: ProposalParameters<T::BlockNumber, BalanceOf<T>>
             = T::FillWorkingGroupOpeningProposalParameters::get();

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

@@ -328,7 +328,6 @@ impl crate::Trait for Test {
     type TextProposalParameters = DefaultProposalParameters;
     type SpendingProposalParameters = DefaultProposalParameters;
     type AddWorkingGroupOpeningProposalParameters = DefaultProposalParameters;
-    type BeginReviewWorkingGroupApplicationsProposalParameters = DefaultProposalParameters;
     type FillWorkingGroupOpeningProposalParameters = DefaultProposalParameters;
     type SetWorkingGroupBudgetCapacityProposalParameters = DefaultProposalParameters;
     type DecreaseWorkingGroupLeaderStakeProposalParameters = DefaultProposalParameters;

runtime/src/lib.rs

@@ -706,8 +706,6 @@ impl proposals_codex::Trait for Runtime {
     type TextProposalParameters = TextProposalParameters;
     type SpendingProposalParameters = SpendingProposalParameters;
     type AddWorkingGroupOpeningProposalParameters = AddWorkingGroupOpeningProposalParameters;
-    type BeginReviewWorkingGroupApplicationsProposalParameters =
-        BeginReviewWorkingGroupApplicationsProposalParameters;
     type FillWorkingGroupOpeningProposalParameters = FillWorkingGroupOpeningProposalParameters;
     type SetWorkingGroupBudgetCapacityProposalParameters =
         SetWorkingGroupBudgetCapacityProposalParameters;

runtime/src/proposals_configuration/defaults.rs

@@ -71,21 +71,6 @@ pub(crate) fn add_working_group_opening_proposal() -> ProposalParameters<BlockNu
     }
 }
 
-// Proposal parameters for the 'Begin review working group applications' proposal
-pub(crate) fn begin_review_working_group_applications_proposal(
-) -> ProposalParameters<BlockNumber, Balance> {
-    ProposalParameters {
-        voting_period: 43200,
-        grace_period: 14400,
-        approval_quorum_percentage: 60,
-        approval_threshold_percentage: 75,
-        slashing_quorum_percentage: 60,
-        slashing_threshold_percentage: 80,
-        required_stake: Some(25000),
-        constitutionality: 1,
-    }
-}
-
 // Proposal parameters for the 'Fill working group opening' proposal
 pub(crate) fn fill_working_group_opening_proposal() -> ProposalParameters<BlockNumber, Balance> {
     ProposalParameters {

runtime/src/proposals_configuration/mod.rs

@@ -27,7 +27,6 @@ parameter_types! {
     pub TextProposalParameters: ProposalParameters<BlockNumber, Balance> = ALL_PROPOSALS_PARAMETERS.text_proposal;
     pub SpendingProposalParameters: ProposalParameters<BlockNumber, Balance> = ALL_PROPOSALS_PARAMETERS.spending_proposal;
     pub AddWorkingGroupOpeningProposalParameters: ProposalParameters<BlockNumber, Balance> = ALL_PROPOSALS_PARAMETERS.add_working_group_opening_proposal;
-    pub BeginReviewWorkingGroupApplicationsProposalParameters: ProposalParameters<BlockNumber, Balance> = ALL_PROPOSALS_PARAMETERS.begin_review_working_group_applications_proposal;
     pub FillWorkingGroupOpeningProposalParameters: ProposalParameters<BlockNumber, Balance> = ALL_PROPOSALS_PARAMETERS.fill_working_group_opening_proposal;
     pub SetWorkingGroupBudgetCapacityProposalParameters: ProposalParameters<BlockNumber, Balance> = ALL_PROPOSALS_PARAMETERS.set_working_group_budget_capacity_proposal;
     pub DecreaseWorkingGroupLeaderStakeProposalParameters: ProposalParameters<BlockNumber, Balance> = ALL_PROPOSALS_PARAMETERS.decrease_working_group_leader_stake_proposal;
@@ -45,7 +44,6 @@ struct AllProposalsParameters {
     pub text_proposal: ProposalParameters<BlockNumber, Balance>,
     pub spending_proposal: ProposalParameters<BlockNumber, Balance>,
     pub add_working_group_opening_proposal: ProposalParameters<BlockNumber, Balance>,
-    pub begin_review_working_group_applications_proposal: ProposalParameters<BlockNumber, Balance>,
     pub fill_working_group_opening_proposal: ProposalParameters<BlockNumber, Balance>,
     pub set_working_group_budget_capacity_proposal: ProposalParameters<BlockNumber, Balance>,
     pub decrease_working_group_leader_stake_proposal: ProposalParameters<BlockNumber, Balance>,
@@ -110,11 +108,6 @@ fn convert_json_object_to_proposal_parameters(
         init_proposal_parameter_object!(params, jo.clone(), text_proposal);
         init_proposal_parameter_object!(params, jo.clone(), spending_proposal);
         init_proposal_parameter_object!(params, jo.clone(), add_working_group_opening_proposal);
-        init_proposal_parameter_object!(
-            params,
-            jo.clone(),
-            begin_review_working_group_applications_proposal
-        );
         init_proposal_parameter_object!(params, jo.clone(), fill_working_group_opening_proposal);
         init_proposal_parameter_object!(
             params,
@@ -251,8 +244,6 @@ fn default_parameters() -> AllProposalsParameters {
         text_proposal: defaults::text_proposal(),
         spending_proposal: defaults::spending_proposal(),
         add_working_group_opening_proposal: defaults::add_working_group_opening_proposal(),
-        begin_review_working_group_applications_proposal:
-            defaults::begin_review_working_group_applications_proposal(),
         fill_working_group_opening_proposal: defaults::fill_working_group_opening_proposal(),
         set_working_group_budget_capacity_proposal:
             defaults::set_working_group_budget_capacity_proposal(),

runtime/src/proposals_configuration/sample_proposal_parameters.json

@@ -14,7 +14,6 @@
   "text_proposal": {},
   "spending_proposal": {},
   "add_working_group_opening_proposal": {},
-  "begin_review_working_group_applications_proposal": {},
   "fill_working_group_opening_proposal": {},
   "set_working_group_budget_capacity_proposal": {},
   "decrease_working_group_leader_stake_proposal": {},