Browse Source

use testing periods in proposals config for nicaea staging

Mokhtar Naamani 4 years ago
parent
commit
77cd943999

+ 1 - 1
node/src/chain_spec.rs

@@ -141,7 +141,7 @@ impl Alternative {
                             get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
                             get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
                         ],
-                        node_runtime::ProposalsConfigParameters::default(),
+                        node_runtime::ProposalsConfigParameters::development(),
                     )
                 },
                 vec![],

+ 39 - 30
runtime-modules/proposals/codex/src/proposal_types/mod.rs

@@ -354,37 +354,46 @@ impl ProposalsConfigParameters {
     /// Development chain config. No grace period,
     /// proposals executed immediatly. Short voting period.
     pub fn development() -> Self {
+        Self::with_grace_and_voting_periods(0, 200)
+    }
+
+    /// Staging chain config. Short grace and voting period
+    pub fn testing() -> Self {
+        Self::with_grace_and_voting_periods(200, 600)
+    }
+
+    fn with_grace_and_voting_periods(grace_period: u32, voting_period: u32) -> Self {
         ProposalsConfigParameters {
-            set_validator_count_proposal_voting_period: 200u32,
-            set_validator_count_proposal_grace_period: 0u32,
-            runtime_upgrade_proposal_voting_period: 200u32,
-            runtime_upgrade_proposal_grace_period: 0u32,
-            text_proposal_voting_period: 200u32,
-            text_proposal_grace_period: 0u32,
-            set_election_parameters_proposal_voting_period: 200u32,
-            set_election_parameters_proposal_grace_period: 0u32,
-            set_content_working_group_mint_capacity_proposal_voting_period: 200u32,
-            set_content_working_group_mint_capacity_proposal_grace_period: 0u32,
-            set_lead_proposal_voting_period: 200u32,
-            set_lead_proposal_grace_period: 0u32,
-            spending_proposal_voting_period: 200u32,
-            spending_proposal_grace_period: 0u32,
-            add_working_group_opening_proposal_voting_period: 200u32,
-            add_working_group_opening_proposal_grace_period: 0u32,
-            begin_review_working_group_leader_applications_proposal_voting_period: 200u32,
-            begin_review_working_group_leader_applications_proposal_grace_period: 0u32,
-            fill_working_group_leader_opening_proposal_voting_period: 200u32,
-            fill_working_group_leader_opening_proposal_grace_period: 0u32,
-            set_working_group_mint_capacity_proposal_voting_period: 200u32,
-            set_working_group_mint_capacity_proposal_grace_period: 0u32,
-            decrease_working_group_leader_stake_proposal_voting_period: 200u32,
-            decrease_working_group_leader_stake_proposal_grace_period: 0u32,
-            slash_working_group_leader_stake_proposal_voting_period: 200u32,
-            slash_working_group_leader_stake_proposal_grace_period: 0u32,
-            set_working_group_leader_reward_proposal_voting_period: 200u32,
-            set_working_group_leader_reward_proposal_grace_period: 0u32,
-            terminate_working_group_leader_role_proposal_voting_period: 200u32,
-            terminate_working_group_leader_role_proposal_grace_period: 0u32,
+            set_validator_count_proposal_voting_period: voting_period,
+            set_validator_count_proposal_grace_period: grace_period,
+            runtime_upgrade_proposal_voting_period: voting_period,
+            runtime_upgrade_proposal_grace_period: grace_period,
+            text_proposal_voting_period: voting_period,
+            text_proposal_grace_period: grace_period,
+            set_election_parameters_proposal_voting_period: voting_period,
+            set_election_parameters_proposal_grace_period: grace_period,
+            set_content_working_group_mint_capacity_proposal_voting_period: voting_period,
+            set_content_working_group_mint_capacity_proposal_grace_period: grace_period,
+            set_lead_proposal_voting_period: voting_period,
+            set_lead_proposal_grace_period: grace_period,
+            spending_proposal_voting_period: voting_period,
+            spending_proposal_grace_period: grace_period,
+            add_working_group_opening_proposal_voting_period: voting_period,
+            add_working_group_opening_proposal_grace_period: grace_period,
+            begin_review_working_group_leader_applications_proposal_voting_period: voting_period,
+            begin_review_working_group_leader_applications_proposal_grace_period: grace_period,
+            fill_working_group_leader_opening_proposal_voting_period: voting_period,
+            fill_working_group_leader_opening_proposal_grace_period: grace_period,
+            set_working_group_mint_capacity_proposal_voting_period: voting_period,
+            set_working_group_mint_capacity_proposal_grace_period: grace_period,
+            decrease_working_group_leader_stake_proposal_voting_period: voting_period,
+            decrease_working_group_leader_stake_proposal_grace_period: grace_period,
+            slash_working_group_leader_stake_proposal_voting_period: voting_period,
+            slash_working_group_leader_stake_proposal_grace_period: grace_period,
+            set_working_group_leader_reward_proposal_voting_period: voting_period,
+            set_working_group_leader_reward_proposal_grace_period: grace_period,
+            terminate_working_group_leader_role_proposal_voting_period: voting_period,
+            terminate_working_group_leader_role_proposal_grace_period: grace_period,
         }
     }
 }

+ 1 - 1
runtime/src/migration.rs

@@ -27,7 +27,7 @@ impl<T: Trait> Module<T> {
         Self::initialize_storage_working_group_text_constraints();
         Self::clear_storage_data();
 
-        proposals_codex::Module::<T>::set_config_values(ProposalsConfigParameters::development());
+        proposals_codex::Module::<T>::set_config_values(ProposalsConfigParameters::testing());
     }
 }