pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-29 05:37:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change assert(is_err()) to assert_noop to check state consistency on errors (#8587)

Browse Source 
* Change is_err() asserts in tests to assert_noop to check state consistency

fixes #8545

* Update frame/transaction-payment/src/lib.rs

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>

* Update frame/contracts/src/exec.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/democracy/src/benchmarking.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update frame/transaction-payment/src/lib.rs

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

* Don't assert no-changing state.

see: https://github.com/paritytech/substrate/pull/8587#issuecomment-817137906

* fix expected error

* Fix non-extrinsic-call asserts

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
This commit is contained in:
Falco Hirschenberger
2021-04-13 12:44:27 +02:00
committed by GitHub
parent b9ed6e01b3
commit 24311eee3e
13 changed files with 142 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/democracy/src/tests/decoders.rs
+5 -4
View File
@@ -58,12 +58,12 @@ fn pre_image() {
let key = Default::default();
let missing = PreimageStatus::Missing(0);
Preimages::<Test>::insert(key, missing);
assert!(Democracy::pre_image_data_len(key).is_err());
assert_noop!(Democracy::pre_image_data_len(key), Error::<Test>::PreimageMissing);
assert_eq!(Democracy::check_pre_image_is_missing(key), Ok(()));
Preimages::<Test>::remove(key);
assert!(Democracy::pre_image_data_len(key).is_err());
assert!(Democracy::check_pre_image_is_missing(key).is_err());
assert_noop!(Democracy::pre_image_data_len(key), Error::<Test>::PreimageMissing);
assert_noop!(Democracy::check_pre_image_is_missing(key), Error::<Test>::NotImminent);
for l in vec![0, 10, 100, 1000u32] {
let available = PreimageStatus::Available{
@@ -76,7 +76,8 @@ fn pre_image() {
Preimages::<Test>::insert(key, available);
assert_eq!(Democracy::pre_image_data_len(key), Ok(l));
assert!(Democracy::check_pre_image_is_missing(key).is_err());
assert_noop!(Democracy::check_pre_image_is_missing(key),
Error::<Test>::DuplicatePreimage);
}
})
}
substrate/frame/democracy/src/tests/external_proposing.rs
+1 -1
View File
@@ -93,7 +93,7 @@ fn external_blacklisting_should_work() {
assert_ok!(Democracy::blacklist(Origin::root(), hash, None));
fast_forward_to(2);
assert!(Democracy::referendum_status(0).is_err());
assert_noop!(Democracy::referendum_status(0), Error::<Test>::ReferendumInvalid);
assert_noop!(
Democracy::external_propose(
substrate/frame/democracy/src/tests/public_proposals.rs
+2 -2
View File
@@ -129,9 +129,9 @@ fn blacklisting_should_work() {
fast_forward_to(2);
let hash = set_balance_proposal_hash(4);
assert!(Democracy::referendum_status(0).is_ok());
assert_ok!(Democracy::referendum_status(0));
assert_ok!(Democracy::blacklist(Origin::root(), hash, Some(0)));
assert!(Democracy::referendum_status(0).is_err());
assert_noop!(Democracy::referendum_status(0), Error::<Test>::ReferendumInvalid);
});
}
substrate/frame/democracy/src/tests/voting.rs
+2 -2
View File
@@ -80,12 +80,12 @@ fn single_proposal_should_work() {
fast_forward_to(3);
// referendum still running
assert!(Democracy::referendum_status(0).is_ok());
assert_ok!(Democracy::referendum_status(0));
// referendum runs during 2 and 3, ends @ start of 4.
fast_forward_to(4);
assert!(Democracy::referendum_status(0).is_err());
assert_noop!(Democracy::referendum_status(0), Error::<Test>::ReferendumInvalid);
assert!(pallet_scheduler::Agenda::<Test>::get(6)[0].is_some());
// referendum passes and wait another two blocks for enactment.