Use ext

frame/collective/src/lib.rs

@@ -590,19 +590,20 @@ mod tests {
 	);
 
 	fn make_ext() -> sp_io::TestExternalities {
-		GenesisConfig {
+		let mut ext: sp_io::TestExternalities = GenesisConfig {
 			collective_Instance1: Some(collective::GenesisConfig {
 				members: vec![1, 2, 3],
 				phantom: Default::default(),
 			}),
 			collective: None,
-		}.build_storage().unwrap().into()
+		}.build_storage().unwrap().into();
+		ext.execute_with(|| System::set_block_number(1));
+		ext
 	}
 
 	#[test]
 	fn motions_basic_environment_works() {
 		make_ext().execute_with(|| {
-			System::set_block_number(1);
 			assert_eq!(Collective::members(), vec![1, 2, 3]);
 			assert_eq!(Collective::proposals(), Vec::<H256>::new());
 		});
@@ -615,7 +616,6 @@ mod tests {
 	#[test]
 	fn close_works() {
 		make_ext().execute_with(|| {
-			System::set_block_number(1);
 			let proposal = make_proposal(42);
 			let hash = BlakeTwo256::hash_of(&proposal);
 
@@ -644,7 +644,6 @@ mod tests {
 	#[test]
 	fn close_with_prime_works() {
 		make_ext().execute_with(|| {
-			System::set_block_number(1);
 			let proposal = make_proposal(42);
 			let hash = BlakeTwo256::hash_of(&proposal);
 			assert_ok!(Collective::set_members(Origin::ROOT, vec![1, 2, 3], Some(3)));
@@ -668,7 +667,6 @@ mod tests {
 	#[test]
 	fn close_with_voting_prime_works() {
 		make_ext().execute_with(|| {
-			System::set_block_number(1);
 			let proposal = make_proposal(42);
 			let hash = BlakeTwo256::hash_of(&proposal);
 			assert_ok!(Collective::set_members(Origin::ROOT, vec![1, 2, 3], Some(1)));
@@ -693,7 +691,6 @@ mod tests {
 	#[test]
 	fn removal_of_old_voters_votes_works() {
 		make_ext().execute_with(|| {
-			System::set_block_number(1);
 			let proposal = make_proposal(42);
 			let hash = BlakeTwo256::hash_of(&proposal);
 			let end = 4;
@@ -728,7 +725,6 @@ mod tests {
 	#[test]
 	fn removal_of_old_voters_votes_works_with_set_members() {
 		make_ext().execute_with(|| {
-			System::set_block_number(1);
 			let proposal = make_proposal(42);
 			let hash = BlakeTwo256::hash_of(&proposal);
 			let end = 4;
@@ -763,7 +759,6 @@ mod tests {
 	#[test]
 	fn propose_works() {
 		make_ext().execute_with(|| {
-			System::set_block_number(1);
 			let proposal = make_proposal(42);
 			let hash = proposal.blake2_256().into();
 			let end = 4;
@@ -793,7 +788,6 @@ mod tests {
 	#[test]
 	fn motions_ignoring_non_collective_proposals_works() {
 		make_ext().execute_with(|| {
-			System::set_block_number(1);
 			let proposal = make_proposal(42);
 			assert_noop!(
 				Collective::propose(Origin::signed(42), 3, Box::new(proposal.clone())),
@@ -805,7 +799,6 @@ mod tests {
 	#[test]
 	fn motions_ignoring_non_collective_votes_works() {
 		make_ext().execute_with(|| {
-			System::set_block_number(1);
 			let proposal = make_proposal(42);
 			let hash: H256 = proposal.blake2_256().into();
 			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone())));
@@ -833,7 +826,6 @@ mod tests {
 	#[test]
 	fn motions_revoting_works() {
 		make_ext().execute_with(|| {
-			System::set_block_number(1);
 			let proposal = make_proposal(42);
 			let hash: H256 = proposal.blake2_256().into();
 			let end = 4;
@@ -885,7 +877,6 @@ mod tests {
 	#[test]
 	fn motions_reproposing_disapproved_works() {
 		make_ext().execute_with(|| {
-			System::set_block_number(1);
 			let proposal = make_proposal(42);
 			let hash: H256 = proposal.blake2_256().into();
 			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone())));
@@ -899,7 +890,6 @@ mod tests {
 	#[test]
 	fn motions_disapproval_works() {
 		make_ext().execute_with(|| {
-			System::set_block_number(1);
 			let proposal = make_proposal(42);
 			let hash: H256 = proposal.blake2_256().into();
 			assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone())));
@@ -942,7 +932,6 @@ mod tests {
 	#[test]
 	fn motions_approval_works() {
 		make_ext().execute_with(|| {
-			System::set_block_number(1);
 			let proposal = make_proposal(42);
 			let hash: H256 = proposal.blake2_256().into();
 			assert_ok!(Collective::propose(Origin::signed(1), 2, Box::new(proposal.clone())));

frame/contracts/src/tests.rs

@@ -279,7 +279,9 @@ impl ExtBuilder {
 			},
 			gas_price: self.gas_price,
 		}.assimilate_storage(&mut t).unwrap();
-		sp_io::TestExternalities::new(t)
+		let mut ext = sp_io::TestExternalities::new(t);
+		ext.execute_with(|| System::set_block_number(1));
+		ext
 	}
 }
 
@@ -415,7 +417,6 @@ fn instantiate_and_call_and_deposit_event() {
 	let (wasm, code_hash) = compile_module::<Test>(CODE_RETURN_FROM_START_FN).unwrap();
 
 	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		System::set_block_number(1);
 		Balances::deposit_creating(&ALICE, 1_000_000);
 
 		assert_ok!(Contracts::put_code(Origin::signed(ALICE), 100_000, wasm));
@@ -506,7 +507,6 @@ fn dispatch_call() {
 	let (wasm, code_hash) = compile_module::<Test>(CODE_DISPATCH_CALL).unwrap();
 
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		System::set_block_number(1);
 		Balances::deposit_creating(&ALICE, 1_000_000);
 
 		assert_ok!(Contracts::put_code(Origin::signed(ALICE), 100_000, wasm));
@@ -645,7 +645,6 @@ fn dispatch_call_not_dispatched_after_top_level_transaction_failure() {
 	let (wasm, code_hash) = compile_module::<Test>(CODE_DISPATCH_CALL_THEN_TRAP).unwrap();
 
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		System::set_block_number(1);
 		Balances::deposit_creating(&ALICE, 1_000_000);
 
 		assert_ok!(Contracts::put_code(Origin::signed(ALICE), 100_000, wasm));
@@ -902,7 +901,6 @@ fn test_set_rent_code_and_hash() {
 	let (wasm, code_hash) = compile_module::<Test>(CODE_SET_RENT).unwrap();
 
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		System::set_block_number(1);
 		Balances::deposit_creating(&ALICE, 1_000_000);
 		assert_ok!(Contracts::put_code(Origin::signed(ALICE), 100_000, wasm));
 
@@ -971,7 +969,6 @@ fn deduct_blocks() {
 	let (wasm, code_hash) = compile_module::<Test>(CODE_SET_RENT).unwrap();
 
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		System::set_block_number(1);
 		// Create
 		Balances::deposit_creating(&ALICE, 1_000_000);
 		assert_ok!(Contracts::put_code(Origin::signed(ALICE), 100_000, wasm));
@@ -1066,7 +1063,6 @@ fn claim_surcharge(blocks: u64, trigger_call: impl Fn() -> bool, removes: bool)
 	let (wasm, code_hash) = compile_module::<Test>(CODE_SET_RENT).unwrap();
 
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		System::set_block_number(1);
 		// Create
 		Balances::deposit_creating(&ALICE, 1_000_000);
 		assert_ok!(Contracts::put_code(Origin::signed(ALICE), 100_000, wasm));
@@ -1420,7 +1416,6 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 		compile_module::<Test>(CODE_RESTORATION).unwrap();
 
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		System::set_block_number(1);
 		Balances::deposit_creating(&ALICE, 1_000_000);
 		assert_ok!(Contracts::put_code(Origin::signed(ALICE), 100_000, restoration_wasm));
 		assert_ok!(Contracts::put_code(Origin::signed(ALICE), 100_000, set_rent_wasm));

frame/democracy/src/tests.rs

@@ -160,7 +160,9 @@ fn new_test_ext() -> sp_io::TestExternalities {
 		balances: vec![(1, 10), (2, 20), (3, 30), (4, 40), (5, 50), (6, 60)],
 	}.assimilate_storage(&mut t).unwrap();
 	GenesisConfig::default().assimilate_storage(&mut t).unwrap();
-	sp_io::TestExternalities::new(t)
+	let mut ext = sp_io::TestExternalities::new(t);
+	ext.execute_with(|| System::set_block_number(1));
+	ext
 }
 
 type System = frame_system::Module<Test>;

frame/democracy/src/tests/cancellation.rs

@@ -21,7 +21,6 @@ use super::*;
 #[test]
 fn cancel_referendum_should_work() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		let r = Democracy::inject_referendum(
 			2,
 			set_balance_proposal_hash_and_note(2),

frame/democracy/src/tests/lock_voting.rs

@@ -140,7 +140,6 @@ fn no_locks_without_conviction_should_work() {
 #[test]
 fn lock_voting_should_work_with_delegation() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		let r = Democracy::inject_referendum(
 			2,
 			set_balance_proposal_hash_and_note(2),

frame/democracy/src/tests/preimage.rs

@@ -21,7 +21,6 @@ use super::*;
 #[test]
 fn missing_preimage_should_fail() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		let r = Democracy::inject_referendum(
 			2,
 			set_balance_proposal_hash(2),
@@ -40,7 +39,6 @@ fn missing_preimage_should_fail() {
 #[test]
 fn preimage_deposit_should_be_required_and_returned() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		// fee of 100 is too much.
 		PREIMAGE_BYTE_DEPOSIT.with(|v| *v.borrow_mut() = 100);
 		assert_noop!(
@@ -71,7 +69,6 @@ fn preimage_deposit_should_be_required_and_returned() {
 #[test]
 fn preimage_deposit_should_be_reapable_earlier_by_owner() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		PREIMAGE_BYTE_DEPOSIT.with(|v| *v.borrow_mut() = 1);
 		assert_ok!(Democracy::note_preimage(Origin::signed(6), set_balance_proposal(2)));
 
@@ -93,7 +90,6 @@ fn preimage_deposit_should_be_reapable_earlier_by_owner() {
 #[test]
 fn preimage_deposit_should_be_reapable() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		assert_noop!(
 				Democracy::reap_preimage(Origin::signed(5), set_balance_proposal_hash(2)),
 				Error::<Test>::PreimageMissing
@@ -122,7 +118,6 @@ fn preimage_deposit_should_be_reapable() {
 #[test]
 fn noting_imminent_preimage_for_free_should_work() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		PREIMAGE_BYTE_DEPOSIT.with(|v| *v.borrow_mut() = 1);
 
 		let r = Democracy::inject_referendum(
@@ -152,7 +147,6 @@ fn noting_imminent_preimage_for_free_should_work() {
 #[test]
 fn reaping_imminent_preimage_should_fail() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		let h = set_balance_proposal_hash_and_note(2);
 		let r = Democracy::inject_referendum(3, h, VoteThreshold::SuperMajorityApprove, 1);
 		assert_ok!(Democracy::vote(Origin::signed(1), r, aye(1)));

frame/democracy/src/tests/public_proposals.rs

@@ -21,7 +21,6 @@ use super::*;
 #[test]
 fn backing_for_should_work() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		assert_ok!(propose_set_balance_and_note(1, 2, 2));
 		assert_ok!(propose_set_balance_and_note(1, 4, 4));
 		assert_ok!(propose_set_balance_and_note(1, 3, 3));
@@ -34,7 +33,6 @@ fn backing_for_should_work() {
 #[test]
 fn deposit_for_proposals_should_be_taken() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		assert_ok!(propose_set_balance_and_note(1, 2, 5));
 		assert_ok!(Democracy::second(Origin::signed(2), 0));
 		assert_ok!(Democracy::second(Origin::signed(5), 0));
@@ -49,7 +47,6 @@ fn deposit_for_proposals_should_be_taken() {
 #[test]
 fn deposit_for_proposals_should_be_returned() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		assert_ok!(propose_set_balance_and_note(1, 2, 5));
 		assert_ok!(Democracy::second(Origin::signed(2), 0));
 		assert_ok!(Democracy::second(Origin::signed(5), 0));
@@ -65,23 +62,20 @@ fn deposit_for_proposals_should_be_returned() {
 #[test]
 fn proposal_with_deposit_below_minimum_should_not_work() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		assert_noop!(propose_set_balance(1, 2, 0), Error::<Test>::ValueLow);
 	});
 }
 
 #[test]
 fn poor_proposer_should_not_work() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		assert_noop!(propose_set_balance(1, 2, 11), BalancesError::<Test, _>::InsufficientBalance);
 	});
 }
 
 #[test]
 fn poor_seconder_should_not_work() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		assert_ok!(propose_set_balance_and_note(2, 2, 11));
 		assert_noop!(Democracy::second(Origin::signed(1), 0), BalancesError::<Test, _>::InsufficientBalance);
 	});

frame/democracy/src/tests/scheduling.rs

@@ -21,7 +21,6 @@ use super::*;
 #[test]
 fn simple_passing_should_work() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		let r = Democracy::inject_referendum(
 			2,
 			set_balance_proposal_hash_and_note(2),
@@ -39,7 +38,6 @@ fn simple_passing_should_work() {
 #[test]
 fn simple_failing_should_work() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		let r = Democracy::inject_referendum(
 			2,
 			set_balance_proposal_hash_and_note(2),
@@ -59,7 +57,6 @@ fn simple_failing_should_work() {
 #[test]
 fn ooo_inject_referendums_should_work() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		let r1 = Democracy::inject_referendum(
 			3,
 			set_balance_proposal_hash_and_note(3),
@@ -90,7 +87,6 @@ fn ooo_inject_referendums_should_work() {
 #[test]
 fn delayed_enactment_should_work() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		let r = Democracy::inject_referendum(
 			2,
 			set_balance_proposal_hash_and_note(2),

frame/democracy/src/tests/voting.rs

@@ -99,7 +99,6 @@ fn single_proposal_should_work() {
 #[test]
 fn controversial_voting_should_work() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		let r = Democracy::inject_referendum(
 			2,
 			set_balance_proposal_hash_and_note(2),
@@ -126,7 +125,6 @@ fn controversial_voting_should_work() {
 #[test]
 fn controversial_low_turnout_voting_should_work() {
 	new_test_ext().execute_with(|| {
-		System::set_block_number(1);
 		let r = Democracy::inject_referendum(
 			2,
 			set_balance_proposal_hash_and_note(2),
@@ -151,7 +149,6 @@ fn passing_low_turnout_voting_should_work() {
 		assert_eq!(Balances::free_balance(42), 0);
 		assert_eq!(Balances::total_issuance(), 210);
 
-		System::set_block_number(1);
 		let r = Democracy::inject_referendum(
 			2,
 			set_balance_proposal_hash_and_note(2),