Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Commit d0bbb22

Browse files
shawntabrizibkchr
shawntabrizi
and
bkchr
authored
Prevent events from being emitted during genesis construction (#5463)
* Don't populate runtime events in genesis * typo * Change to block zero * Fix vesting tests * Update frame/system/src/lib.rs Co-Authored-By: Bastian Köcher <[email protected]> * Update frame/system/src/lib.rs Co-Authored-By: Bastian Köcher <[email protected]> * Add test * Fix test * Fix contract tests * Fix phragmen tests * Fix Generic Assets Tests * Fix offences tests * Fix im-online * fix recovery * Fix utility tests * Shorter * Use ext Co-authored-by: Bastian Köcher <[email protected]>
1 parent 5f51dd8 commit d0bbb22

File tree

22 files changed

+73
-110
lines changed

22 files changed

+73
-110
lines changed

‎bin/node/executor/tests/submit_transaction.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,8 @@ fn submitted_transaction_should_be_valid() {
181181
priority: 2_411_002_000_000,
182182
requires: vec![],
183183
provides: vec![(address, 0).encode()],
184-
longevity: 127,
184+
longevity: 128,
185185
propagate: true,
186186
});
187187
});
188188
}
189-

‎frame/collective/src/lib.rs‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -590,19 +590,20 @@ mod tests {
590590
);
591591

592592
fn make_ext() -> sp_io::TestExternalities {
593-
GenesisConfig {
593+
let mut ext: sp_io::TestExternalities = GenesisConfig {
594594
collective_Instance1: Some(collective::GenesisConfig {
595595
members: vec![1, 2, 3],
596596
phantom: Default::default(),
597597
}),
598598
collective: None,
599-
}.build_storage().unwrap().into()
599+
}.build_storage().unwrap().into();
600+
ext.execute_with(|| System::set_block_number(1));
601+
ext
600602
}
601603

602604
#[test]
603605
fn motions_basic_environment_works() {
604606
make_ext().execute_with(|| {
605-
System::set_block_number(1);
606607
assert_eq!(Collective::members(), vec![1, 2, 3]);
607608
assert_eq!(Collective::proposals(), Vec::<H256>::new());
608609
});
@@ -615,7 +616,6 @@ mod tests {
615616
#[test]
616617
fn close_works() {
617618
make_ext().execute_with(|| {
618-
System::set_block_number(1);
619619
let proposal = make_proposal(42);
620620
let hash = BlakeTwo256::hash_of(&proposal);
621621

@@ -644,7 +644,6 @@ mod tests {
644644
#[test]
645645
fn close_with_prime_works() {
646646
make_ext().execute_with(|| {
647-
System::set_block_number(1);
648647
let proposal = make_proposal(42);
649648
let hash = BlakeTwo256::hash_of(&proposal);
650649
assert_ok!(Collective::set_members(Origin::ROOT, vec![1, 2, 3], Some(3)));
@@ -668,7 +667,6 @@ mod tests {
668667
#[test]
669668
fn close_with_voting_prime_works() {
670669
make_ext().execute_with(|| {
671-
System::set_block_number(1);
672670
let proposal = make_proposal(42);
673671
let hash = BlakeTwo256::hash_of(&proposal);
674672
assert_ok!(Collective::set_members(Origin::ROOT, vec![1, 2, 3], Some(1)));
@@ -693,7 +691,6 @@ mod tests {
693691
#[test]
694692
fn removal_of_old_voters_votes_works() {
695693
make_ext().execute_with(|| {
696-
System::set_block_number(1);
697694
let proposal = make_proposal(42);
698695
let hash = BlakeTwo256::hash_of(&proposal);
699696
let end = 4;
@@ -728,7 +725,6 @@ mod tests {
728725
#[test]
729726
fn removal_of_old_voters_votes_works_with_set_members() {
730727
make_ext().execute_with(|| {
731-
System::set_block_number(1);
732728
let proposal = make_proposal(42);
733729
let hash = BlakeTwo256::hash_of(&proposal);
734730
let end = 4;
@@ -763,7 +759,6 @@ mod tests {
763759
#[test]
764760
fn propose_works() {
765761
make_ext().execute_with(|| {
766-
System::set_block_number(1);
767762
let proposal = make_proposal(42);
768763
let hash = proposal.blake2_256().into();
769764
let end = 4;
@@ -793,7 +788,6 @@ mod tests {
793788
#[test]
794789
fn motions_ignoring_non_collective_proposals_works() {
795790
make_ext().execute_with(|| {
796-
System::set_block_number(1);
797791
let proposal = make_proposal(42);
798792
assert_noop!(
799793
Collective::propose(Origin::signed(42), 3, Box::new(proposal.clone())),
@@ -805,7 +799,6 @@ mod tests {
805799
#[test]
806800
fn motions_ignoring_non_collective_votes_works() {
807801
make_ext().execute_with(|| {
808-
System::set_block_number(1);
809802
let proposal = make_proposal(42);
810803
let hash: H256 = proposal.blake2_256().into();
811804
assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone())));
@@ -833,7 +826,6 @@ mod tests {
833826
#[test]
834827
fn motions_revoting_works() {
835828
make_ext().execute_with(|| {
836-
System::set_block_number(1);
837829
let proposal = make_proposal(42);
838830
let hash: H256 = proposal.blake2_256().into();
839831
let end = 4;
@@ -885,7 +877,6 @@ mod tests {
885877
#[test]
886878
fn motions_reproposing_disapproved_works() {
887879
make_ext().execute_with(|| {
888-
System::set_block_number(1);
889880
let proposal = make_proposal(42);
890881
let hash: H256 = proposal.blake2_256().into();
891882
assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone())));
@@ -899,7 +890,6 @@ mod tests {
899890
#[test]
900891
fn motions_disapproval_works() {
901892
make_ext().execute_with(|| {
902-
System::set_block_number(1);
903893
let proposal = make_proposal(42);
904894
let hash: H256 = proposal.blake2_256().into();
905895
assert_ok!(Collective::propose(Origin::signed(1), 3, Box::new(proposal.clone())));
@@ -942,7 +932,6 @@ mod tests {
942932
#[test]
943933
fn motions_approval_works() {
944934
make_ext().execute_with(|| {
945-
System::set_block_number(1);
946935
let proposal = make_proposal(42);
947936
let hash: H256 = proposal.blake2_256().into();
948937
assert_ok!(Collective::propose(Origin::signed(1), 2, Box::new(proposal.clone())));

‎frame/contracts/src/tests.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,9 @@ impl ExtBuilder {
279279
},
280280
gas_price: self.gas_price,
281281
}.assimilate_storage(&mut t).unwrap();
282-
sp_io::TestExternalities::new(t)
282+
let mut ext = sp_io::TestExternalities::new(t);
283+
ext.execute_with(|| System::set_block_number(1));
284+
ext
283285
}
284286
}
285287

‎frame/democracy/src/tests.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,9 @@ fn new_test_ext() -> sp_io::TestExternalities {
160160
balances: vec![(1, 10), (2, 20), (3, 30), (4, 40), (5, 50), (6, 60)],
161161
}.assimilate_storage(&mut t).unwrap();
162162
GenesisConfig::default().assimilate_storage(&mut t).unwrap();
163-
sp_io::TestExternalities::new(t)
163+
let mut ext = sp_io::TestExternalities::new(t);
164+
ext.execute_with(|| System::set_block_number(1));
165+
ext
164166
}
165167

166168
type System = frame_system::Module<Test>;

‎frame/democracy/src/tests/cancellation.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ use super::*;
2121
#[test]
2222
fn cancel_referendum_should_work() {
2323
new_test_ext().execute_with(|| {
24-
System::set_block_number(1);
2524
let r = Democracy::inject_referendum(
2625
2,
2726
set_balance_proposal_hash_and_note(2),

‎frame/democracy/src/tests/lock_voting.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ fn no_locks_without_conviction_should_work() {
140140
#[test]
141141
fn lock_voting_should_work_with_delegation() {
142142
new_test_ext().execute_with(|| {
143-
System::set_block_number(1);
144143
let r = Democracy::inject_referendum(
145144
2,
146145
set_balance_proposal_hash_and_note(2),

‎frame/democracy/src/tests/preimage.rs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ use super::*;
2121
#[test]
2222
fn missing_preimage_should_fail() {
2323
new_test_ext().execute_with(|| {
24-
System::set_block_number(1);
2524
let r = Democracy::inject_referendum(
2625
2,
2726
set_balance_proposal_hash(2),
@@ -40,7 +39,6 @@ fn missing_preimage_should_fail() {
4039
#[test]
4140
fn preimage_deposit_should_be_required_and_returned() {
4241
new_test_ext().execute_with(|| {
43-
System::set_block_number(1);
4442
// fee of 100 is too much.
4543
PREIMAGE_BYTE_DEPOSIT.with(|v| *v.borrow_mut() = 100);
4644
assert_noop!(
@@ -71,7 +69,6 @@ fn preimage_deposit_should_be_required_and_returned() {
7169
#[test]
7270
fn preimage_deposit_should_be_reapable_earlier_by_owner() {
7371
new_test_ext().execute_with(|| {
74-
System::set_block_number(1);
7572
PREIMAGE_BYTE_DEPOSIT.with(|v| *v.borrow_mut() = 1);
7673
assert_ok!(Democracy::note_preimage(Origin::signed(6), set_balance_proposal(2)));
7774

@@ -93,7 +90,6 @@ fn preimage_deposit_should_be_reapable_earlier_by_owner() {
9390
#[test]
9491
fn preimage_deposit_should_be_reapable() {
9592
new_test_ext().execute_with(|| {
96-
System::set_block_number(1);
9793
assert_noop!(
9894
Democracy::reap_preimage(Origin::signed(5), set_balance_proposal_hash(2)),
9995
Error::<Test>::PreimageMissing
@@ -122,7 +118,6 @@ fn preimage_deposit_should_be_reapable() {
122118
#[test]
123119
fn noting_imminent_preimage_for_free_should_work() {
124120
new_test_ext().execute_with(|| {
125-
System::set_block_number(1);
126121
PREIMAGE_BYTE_DEPOSIT.with(|v| *v.borrow_mut() = 1);
127122

128123
let r = Democracy::inject_referendum(
@@ -152,7 +147,6 @@ fn noting_imminent_preimage_for_free_should_work() {
152147
#[test]
153148
fn reaping_imminent_preimage_should_fail() {
154149
new_test_ext().execute_with(|| {
155-
System::set_block_number(1);
156150
let h = set_balance_proposal_hash_and_note(2);
157151
let r = Democracy::inject_referendum(3, h, VoteThreshold::SuperMajorityApprove, 1);
158152
assert_ok!(Democracy::vote(Origin::signed(1), r, aye(1)));

‎frame/democracy/src/tests/public_proposals.rs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ use super::*;
2121
#[test]
2222
fn backing_for_should_work() {
2323
new_test_ext().execute_with(|| {
24-
System::set_block_number(1);
2524
assert_ok!(propose_set_balance_and_note(1, 2, 2));
2625
assert_ok!(propose_set_balance_and_note(1, 4, 4));
2726
assert_ok!(propose_set_balance_and_note(1, 3, 3));
@@ -34,7 +33,6 @@ fn backing_for_should_work() {
3433
#[test]
3534
fn deposit_for_proposals_should_be_taken() {
3635
new_test_ext().execute_with(|| {
37-
System::set_block_number(1);
3836
assert_ok!(propose_set_balance_and_note(1, 2, 5));
3937
assert_ok!(Democracy::second(Origin::signed(2), 0));
4038
assert_ok!(Democracy::second(Origin::signed(5), 0));
@@ -49,7 +47,6 @@ fn deposit_for_proposals_should_be_taken() {
4947
#[test]
5048
fn deposit_for_proposals_should_be_returned() {
5149
new_test_ext().execute_with(|| {
52-
System::set_block_number(1);
5350
assert_ok!(propose_set_balance_and_note(1, 2, 5));
5451
assert_ok!(Democracy::second(Origin::signed(2), 0));
5552
assert_ok!(Democracy::second(Origin::signed(5), 0));
@@ -65,23 +62,20 @@ fn deposit_for_proposals_should_be_returned() {
6562
#[test]
6663
fn proposal_with_deposit_below_minimum_should_not_work() {
6764
new_test_ext().execute_with(|| {
68-
System::set_block_number(1);
6965
assert_noop!(propose_set_balance(1, 2, 0), Error::<Test>::ValueLow);
7066
});
7167
}
7268

7369
#[test]
7470
fn poor_proposer_should_not_work() {
7571
new_test_ext().execute_with(|| {
76-
System::set_block_number(1);
7772
assert_noop!(propose_set_balance(1, 2, 11), BalancesError::<Test, _>::InsufficientBalance);
7873
});
7974
}
8075

8176
#[test]
8277
fn poor_seconder_should_not_work() {
8378
new_test_ext().execute_with(|| {
84-
System::set_block_number(1);
8579
assert_ok!(propose_set_balance_and_note(2, 2, 11));
8680
assert_noop!(Democracy::second(Origin::signed(1), 0), BalancesError::<Test, _>::InsufficientBalance);
8781
});

‎frame/democracy/src/tests/scheduling.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ use super::*;
2121
#[test]
2222
fn simple_passing_should_work() {
2323
new_test_ext().execute_with(|| {
24-
System::set_block_number(1);
2524
let r = Democracy::inject_referendum(
2625
2,
2726
set_balance_proposal_hash_and_note(2),
@@ -39,7 +38,6 @@ fn simple_passing_should_work() {
3938
#[test]
4039
fn simple_failing_should_work() {
4140
new_test_ext().execute_with(|| {
42-
System::set_block_number(1);
4341
let r = Democracy::inject_referendum(
4442
2,
4543
set_balance_proposal_hash_and_note(2),
@@ -59,7 +57,6 @@ fn simple_failing_should_work() {
5957
#[test]
6058
fn ooo_inject_referendums_should_work() {
6159
new_test_ext().execute_with(|| {
62-
System::set_block_number(1);
6360
let r1 = Democracy::inject_referendum(
6461
3,
6562
set_balance_proposal_hash_and_note(3),
@@ -90,7 +87,6 @@ fn ooo_inject_referendums_should_work() {
9087
#[test]
9188
fn delayed_enactment_should_work() {
9289
new_test_ext().execute_with(|| {
93-
System::set_block_number(1);
9490
let r = Democracy::inject_referendum(
9591
2,
9692
set_balance_proposal_hash_and_note(2),

‎frame/democracy/src/tests/voting.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ fn single_proposal_should_work() {
9999
#[test]
100100
fn controversial_voting_should_work() {
101101
new_test_ext().execute_with(|| {
102-
System::set_block_number(1);
103102
let r = Democracy::inject_referendum(
104103
2,
105104
set_balance_proposal_hash_and_note(2),
@@ -126,7 +125,6 @@ fn controversial_voting_should_work() {
126125
#[test]
127126
fn controversial_low_turnout_voting_should_work() {
128127
new_test_ext().execute_with(|| {
129-
System::set_block_number(1);
130128
let r = Democracy::inject_referendum(
131129
2,
132130
set_balance_proposal_hash_and_note(2),
@@ -151,7 +149,6 @@ fn passing_low_turnout_voting_should_work() {
151149
assert_eq!(Balances::free_balance(42), 0);
152150
assert_eq!(Balances::total_issuance(), 210);
153151

154-
System::set_block_number(1);
155152
let r = Democracy::inject_referendum(
156153
2,
157154
set_balance_proposal_hash_and_note(2),

0 commit comments

Comments
 (0)