Browse Source

runtime: Fix broken tests.

Shamil Gadelshin 4 years ago
parent
commit
75873ec9cc

+ 3 - 3
runtime/src/tests/proposals_integration/mod.rs

@@ -309,7 +309,7 @@ fn proposal_cancellation_with_slashes_with_balance_checks_succeeds() {
         let mut expected_proposal = Proposal {
             parameters,
             proposer_id: member_id,
-            created_at: 1,
+            created_at: 0,
             status: ProposalStatus::Active(Some(ActiveStake {
                 stake_id: 0,
                 source_account_id: account_id.clone(),
@@ -330,7 +330,7 @@ fn proposal_cancellation_with_slashes_with_balance_checks_succeeds() {
 
         expected_proposal.status = ProposalStatus::Finalized(FinalizationData {
             proposal_status: ProposalDecisionStatus::Canceled,
-            finalized_at: 1,
+            finalized_at: 0,
             encoded_unstaking_error_due_to_broken_runtime: None,
             stake_data_after_unstaking_error: None,
         });
@@ -529,7 +529,7 @@ where
             Proposal {
                 status: ProposalStatus::approved(
                     ApprovedProposalStatus::Executed,
-                    self.run_to_block - 1
+                    self.run_to_block - 2
                 ),
                 title: b"title".to_vec(),
                 description: b"body".to_vec(),

+ 10 - 10
runtime/src/tests/proposals_integration/working_group_proposals.rs

@@ -22,7 +22,7 @@ fn add_opening(
     sequence_number: u32, // action sequence number to align with other actions
 ) -> u64 {
     let expected_proposal_id = sequence_number;
-    let run_to_block = sequence_number + 1;
+    let run_to_block = sequence_number * 2;
 
     let opening_id = StorageWorkingGroup::next_opening_id();
 
@@ -63,7 +63,7 @@ fn begin_review_applications(
     sequence_number: u32, // action sequence number to align with other actions
 ) {
     let expected_proposal_id = sequence_number;
-    let run_to_block = sequence_number + 1;
+    let run_to_block = sequence_number * 2;
 
     let codex_extrinsic_test_fixture = CodexProposalTestFixture::default_for_call(|| {
         ProposalCodex::create_begin_review_working_group_leader_applications_proposal(
@@ -92,7 +92,7 @@ fn fill_opening(
     sequence_number: u32, // action sequence number to align with other actions
 ) {
     let expected_proposal_id = sequence_number;
-    let run_to_block = sequence_number + 1;
+    let run_to_block = sequence_number * 2;
 
     let codex_extrinsic_test_fixture = CodexProposalTestFixture::default_for_call(|| {
         ProposalCodex::create_fill_working_group_leader_opening_proposal(
@@ -132,7 +132,7 @@ fn decrease_stake(
     sequence_number: u32, // action sequence number to align with other actions
 ) {
     let expected_proposal_id = sequence_number;
-    let run_to_block = sequence_number + 1;
+    let run_to_block = sequence_number * 2;
 
     let codex_extrinsic_test_fixture = CodexProposalTestFixture::default_for_call(|| {
         ProposalCodex::create_decrease_working_group_leader_stake_proposal(
@@ -161,7 +161,7 @@ fn slash_stake(
     sequence_number: u32, // action sequence number to align with other actions
 ) {
     let expected_proposal_id = sequence_number;
-    let run_to_block = sequence_number + 1;
+    let run_to_block = sequence_number * 2;
 
     let codex_extrinsic_test_fixture = CodexProposalTestFixture::default_for_call(|| {
         ProposalCodex::create_slash_working_group_leader_stake_proposal(
@@ -190,7 +190,7 @@ fn set_reward(
     sequence_number: u32, // action sequence number to align with other actions
 ) {
     let expected_proposal_id = sequence_number;
-    let run_to_block = sequence_number + 1;
+    let run_to_block = sequence_number * 2;
 
     let codex_extrinsic_test_fixture = CodexProposalTestFixture::default_for_call(|| {
         ProposalCodex::create_set_working_group_leader_reward_proposal(
@@ -219,7 +219,7 @@ fn set_mint_capacity(
     setup_environment: bool,
 ) {
     let expected_proposal_id = sequence_number;
-    let run_to_block = sequence_number + 1;
+    let run_to_block = sequence_number * 2;
 
     let mint_id_result = <minting::Module<Runtime>>::add_mint(0, None);
 
@@ -253,7 +253,7 @@ fn terminate_role(
     sequence_number: u32, // action sequence number to align with other actions
 ) {
     let expected_proposal_id = sequence_number;
-    let run_to_block = sequence_number + 1;
+    let run_to_block = sequence_number * 2;
 
     let codex_extrinsic_test_fixture = CodexProposalTestFixture::default_for_call(|| {
         ProposalCodex::create_terminate_working_group_leader_role_proposal(
@@ -330,7 +330,7 @@ fn create_begin_review_working_group_leader_applications_proposal_execution_succ
             hiring_opening.stage,
             hiring::OpeningStage::Active {
                 stage: hiring::ActiveOpeningStage::AcceptingApplications {
-                    started_accepting_applicants_at_block: 1
+                    started_accepting_applicants_at_block: 0
                 },
                 applications_added: BTreeSet::new(),
                 active_application_count: 0,
@@ -346,7 +346,7 @@ fn create_begin_review_working_group_leader_applications_proposal_execution_succ
             hiring_opening.stage,
             hiring::OpeningStage::Active {
                 stage: hiring::ActiveOpeningStage::ReviewPeriod {
-                    started_accepting_applicants_at_block: 1,
+                    started_accepting_applicants_at_block: 0,
                     started_review_period_at_block: 2,
                 },
                 applications_added: BTreeSet::new(),

+ 2 - 0
runtime/src/tests/storage_integration.rs

@@ -8,6 +8,8 @@ use working_group::{Instance2, Worker};
 #[test]
 fn storage_provider_helper_succeeds() {
     initial_test_ext().execute_with(|| {
+		// Bug in random module requires move the initial block number.
+		<system::Module<Runtime>>::set_block_number(1);
 
 		// Error - no workers.
 		let random_provider_result = <StorageProviderHelper