pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-23 05:01:08 +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/contracts/src/exec.rs
+6 -2
View File
@@ -937,7 +937,7 @@ mod tests {
use super::*; use super::*;
use crate::{ use crate::{
gas::GasMeter, tests::{ExtBuilder, Test, Event as MetaEvent}, gas::GasMeter, tests::{ExtBuilder, Test, Event as MetaEvent},
storage::Storage, storage::{Storage, ContractAbsentError},
tests::{ tests::{
ALICE, BOB, CHARLIE, ALICE, BOB, CHARLIE,
test_utils::{place_contract, set_balance, get_balance}, test_utils::{place_contract, set_balance, get_balance},
@@ -945,6 +945,7 @@ mod tests {
exec::ExportedFunction::*, exec::ExportedFunction::*,
Error, Weight, CurrentSchedule, Error, Weight, CurrentSchedule,
}; };
use frame_support::assert_noop;
use sp_runtime::DispatchError; use sp_runtime::DispatchError;
use assert_matches::assert_matches; use assert_matches::assert_matches;
use std::{cell::RefCell, collections::HashMap, rc::Rc}; use std::{cell::RefCell, collections::HashMap, rc::Rc};
@@ -1571,7 +1572,10 @@ mod tests {
); );
// Check that the account has not been created. // Check that the account has not been created.
assert!(Storage::<Test>::code_hash(&instantiated_contract_address).is_err()); assert_noop!(
Storage::<Test>::code_hash(&instantiated_contract_address),
ContractAbsentError,
);
assert!(events().is_empty()); assert!(events().is_empty());
}); });
} }
substrate/frame/democracy/src/benchmarking.rs
+16 -7
View File
@@ -21,8 +21,9 @@ use super::*;
use frame_benchmarking::{benchmarks, account, whitelist_account, impl_benchmark_test_suite}; use frame_benchmarking::{benchmarks, account, whitelist_account, impl_benchmark_test_suite};
use frame_support::{ use frame_support::{
IterableStorageMap, assert_noop, assert_ok, IterableStorageMap,
traits::{Currency, Get, EnsureOrigin, OnInitialize, UnfilteredDispatchable, schedule::DispatchTime}, traits::{Currency, Get, EnsureOrigin, OnInitialize, UnfilteredDispatchable,
schedule::DispatchTime},
}; };
use frame_system::{RawOrigin, Pallet as System, self, EventRecord}; use frame_system::{RawOrigin, Pallet as System, self, EventRecord};
use sp_runtime::traits::{Bounded, One}; use sp_runtime::traits::{Bounded, One};
@@ -206,11 +207,14 @@ benchmarks! {
let origin = T::CancellationOrigin::successful_origin(); let origin = T::CancellationOrigin::successful_origin();
let referendum_index = add_referendum::<T>(0)?; let referendum_index = add_referendum::<T>(0)?;
let call = Call::<T>::emergency_cancel(referendum_index); let call = Call::<T>::emergency_cancel(referendum_index);
assert!(Democracy::<T>::referendum_status(referendum_index).is_ok()); assert_ok!(Democracy::<T>::referendum_status(referendum_index));
}: { call.dispatch_bypass_filter(origin)? } }: { call.dispatch_bypass_filter(origin)? }
verify { verify {
// Referendum has been canceled // Referendum has been canceled
assert!(Democracy::<T>::referendum_status(referendum_index).is_err()); assert_noop!(
Democracy::<T>::referendum_status(referendum_index),
Error::<T>::ReferendumInvalid,
);
} }
blacklist { blacklist {
@@ -224,18 +228,23 @@ benchmarks! {
// Place our proposal in the external queue, too. // Place our proposal in the external queue, too.
let hash = T::Hashing::hash_of(&0); let hash = T::Hashing::hash_of(&0);
assert!(Democracy::<T>::external_propose(T::ExternalOrigin::successful_origin(), hash.clone()).is_ok()); assert_ok!(
Democracy::<T>::external_propose(T::ExternalOrigin::successful_origin(), hash.clone())
);
// Add a referendum of our proposal. // Add a referendum of our proposal.
let referendum_index = add_referendum::<T>(0)?; let referendum_index = add_referendum::<T>(0)?;
assert!(Democracy::<T>::referendum_status(referendum_index).is_ok()); assert_ok!(Democracy::<T>::referendum_status(referendum_index));
let call = Call::<T>::blacklist(hash, Some(referendum_index)); let call = Call::<T>::blacklist(hash, Some(referendum_index));
let origin = T::BlacklistOrigin::successful_origin(); let origin = T::BlacklistOrigin::successful_origin();
}: { call.dispatch_bypass_filter(origin)? } }: { call.dispatch_bypass_filter(origin)? }
verify { verify {
// Referendum has been canceled // Referendum has been canceled
assert!(Democracy::<T>::referendum_status(referendum_index).is_err()); assert_noop!(
Democracy::<T>::referendum_status(referendum_index),
Error::<T>::ReferendumInvalid
);
} }
// Worst case scenario, we external propose a previously blacklisted proposal // Worst case scenario, we external propose a previously blacklisted proposal
substrate/frame/democracy/src/tests/decoders.rs
+5 -4
View File
@@ -58,12 +58,12 @@ fn pre_image() {
let key = Default::default(); let key = Default::default();
let missing = PreimageStatus::Missing(0); let missing = PreimageStatus::Missing(0);
Preimages::<Test>::insert(key, missing); 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(())); assert_eq!(Democracy::check_pre_image_is_missing(key), Ok(()));
Preimages::<Test>::remove(key); Preimages::<Test>::remove(key);
assert!(Democracy::pre_image_data_len(key).is_err()); assert_noop!(Democracy::pre_image_data_len(key), Error::<Test>::PreimageMissing);
assert!(Democracy::check_pre_image_is_missing(key).is_err()); assert_noop!(Democracy::check_pre_image_is_missing(key), Error::<Test>::NotImminent);
for l in vec![0, 10, 100, 1000u32] { for l in vec![0, 10, 100, 1000u32] {
let available = PreimageStatus::Available{ let available = PreimageStatus::Available{
@@ -76,7 +76,8 @@ fn pre_image() {
Preimages::<Test>::insert(key, available); Preimages::<Test>::insert(key, available);
assert_eq!(Democracy::pre_image_data_len(key), Ok(l)); 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)); assert_ok!(Democracy::blacklist(Origin::root(), hash, None));
fast_forward_to(2); fast_forward_to(2);
assert!(Democracy::referendum_status(0).is_err()); assert_noop!(Democracy::referendum_status(0), Error::<Test>::ReferendumInvalid);
assert_noop!( assert_noop!(
Democracy::external_propose( 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); fast_forward_to(2);
let hash = set_balance_proposal_hash(4); 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_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); fast_forward_to(3);
// referendum still running // 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. // referendum runs during 2 and 3, ends @ start of 4.
fast_forward_to(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()); assert!(pallet_scheduler::Agenda::<Test>::get(6)[0].is_some());
// referendum passes and wait another two blocks for enactment. // referendum passes and wait another two blocks for enactment.
substrate/frame/election-provider-multi-phase/src/unsigned.rs
+7 -7
View File
@@ -832,20 +832,20 @@ mod tests {
assert!(MultiPhase::try_acquire_offchain_lock(25).is_ok()); assert!(MultiPhase::try_acquire_offchain_lock(25).is_ok());
// next block: rejected. // next block: rejected.
assert!(MultiPhase::try_acquire_offchain_lock(26).is_err()); assert_noop!(MultiPhase::try_acquire_offchain_lock(26), "recently executed.");
// allowed after `OFFCHAIN_REPEAT` // allowed after `OFFCHAIN_REPEAT`
assert!(MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT).into()).is_ok()); assert!(MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT).into()).is_ok());
// a fork like situation: re-execute last 3. // a fork like situation: re-execute last 3.
assert!( assert_noop!(
MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT - 3).into()).is_err() MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT - 3).into()), "fork."
); );
assert!( assert_noop!(
MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT - 2).into()).is_err() MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT - 2).into()), "fork."
); );
assert!( assert_noop!(
MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT - 1).into()).is_err() MultiPhase::try_acquire_offchain_lock((26 + OFFCHAIN_REPEAT - 1).into()), "fork."
); );
}) })
} }
substrate/frame/executive/src/lib.rs
+4 -2
View File
@@ -535,7 +535,7 @@ mod tests {
}, },
}; };
use frame_support::{ use frame_support::{
parameter_types, assert_err, parameter_types,
weights::{Weight, RuntimeDbWeight, IdentityFee, WeightToFeePolynomial}, weights::{Weight, RuntimeDbWeight, IdentityFee, WeightToFeePolynomial},
traits::{Currency, LockIdentifier, LockableCurrency, WithdrawReasons}, traits::{Currency, LockIdentifier, LockableCurrency, WithdrawReasons},
}; };
@@ -889,7 +889,9 @@ mod tests {
[69u8; 32].into(), [69u8; 32].into(),
Digest::default(), Digest::default(),
)); ));
assert!(Executive::apply_extrinsic(xt).is_err()); assert_err!(Executive::apply_extrinsic(xt),
TransactionValidityError::Invalid(InvalidTransaction::Future)
);
assert_eq!(<frame_system::Pallet<Runtime>>::extrinsic_index(), Some(0)); assert_eq!(<frame_system::Pallet<Runtime>>::extrinsic_index(), Some(0));
}); });
} }
substrate/frame/grandpa/src/tests.rs
+34 -13
View File
@@ -24,7 +24,7 @@ use crate::mock::*;
use codec::{Decode, Encode}; use codec::{Decode, Encode};
use fg_primitives::ScheduledChange; use fg_primitives::ScheduledChange;
use frame_support::{ use frame_support::{
assert_err, assert_ok, assert_err, assert_ok, assert_noop,
traits::{Currency, OnFinalize, OneSessionHandler}, traits::{Currency, OnFinalize, OneSessionHandler},
weights::{GetDispatchInfo, Pays}, weights::{GetDispatchInfo, Pays},
}; };
@@ -100,21 +100,27 @@ fn cannot_schedule_change_when_one_pending() {
initialize_block(1, Default::default()); initialize_block(1, Default::default());
Grandpa::schedule_change(to_authorities(vec![(4, 1), (5, 1), (6, 1)]), 1, None).unwrap(); Grandpa::schedule_change(to_authorities(vec![(4, 1), (5, 1), (6, 1)]), 1, None).unwrap();
assert!(<PendingChange<Test>>::exists()); assert!(<PendingChange<Test>>::exists());
assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None).is_err()); assert_noop!(
Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None),
Error::<Test>::ChangePending
);
Grandpa::on_finalize(1); Grandpa::on_finalize(1);
let header = System::finalize(); let header = System::finalize();
initialize_block(2, header.hash()); initialize_block(2, header.hash());
assert!(<PendingChange<Test>>::exists()); assert!(<PendingChange<Test>>::exists());
assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None).is_err()); assert_noop!(
Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None),
Error::<Test>::ChangePending
);
Grandpa::on_finalize(2); Grandpa::on_finalize(2);
let header = System::finalize(); let header = System::finalize();
initialize_block(3, header.hash()); initialize_block(3, header.hash());
assert!(!<PendingChange<Test>>::exists()); assert!(!<PendingChange<Test>>::exists());
assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None).is_ok()); assert_ok!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None));
Grandpa::on_finalize(3); Grandpa::on_finalize(3);
let _header = System::finalize(); let _header = System::finalize();
@@ -148,7 +154,10 @@ fn dispatch_forced_change() {
).unwrap(); ).unwrap();
assert!(<PendingChange<Test>>::exists()); assert!(<PendingChange<Test>>::exists());
assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, Some(0)).is_err()); assert_noop!(
Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, Some(0)),
Error::<Test>::ChangePending
);
Grandpa::on_finalize(1); Grandpa::on_finalize(1);
let mut header = System::finalize(); let mut header = System::finalize();
@@ -157,8 +166,14 @@ fn dispatch_forced_change() {
initialize_block(i, header.hash()); initialize_block(i, header.hash());
assert!(<PendingChange<Test>>::get().unwrap().forced.is_some()); assert!(<PendingChange<Test>>::get().unwrap().forced.is_some());
assert_eq!(Grandpa::next_forced(), Some(11)); assert_eq!(Grandpa::next_forced(), Some(11));
assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None).is_err()); assert_noop!(
assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, Some(0)).is_err()); Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None),
Error::<Test>::ChangePending
);
assert_noop!(
Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, Some(0)),
Error::<Test>::ChangePending
);
Grandpa::on_finalize(i); Grandpa::on_finalize(i);
header = System::finalize(); header = System::finalize();
@@ -170,7 +185,7 @@ fn dispatch_forced_change() {
initialize_block(7, header.hash()); initialize_block(7, header.hash());
assert!(!<PendingChange<Test>>::exists()); assert!(!<PendingChange<Test>>::exists());
assert_eq!(Grandpa::grandpa_authorities(), to_authorities(vec![(4, 1), (5, 1), (6, 1)])); assert_eq!(Grandpa::grandpa_authorities(), to_authorities(vec![(4, 1), (5, 1), (6, 1)]));
assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None).is_ok()); assert_ok!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None));
Grandpa::on_finalize(7); Grandpa::on_finalize(7);
header = System::finalize(); header = System::finalize();
} }
@@ -180,7 +195,10 @@ fn dispatch_forced_change() {
initialize_block(8, header.hash()); initialize_block(8, header.hash());
assert!(<PendingChange<Test>>::exists()); assert!(<PendingChange<Test>>::exists());
assert_eq!(Grandpa::grandpa_authorities(), to_authorities(vec![(4, 1), (5, 1), (6, 1)])); assert_eq!(Grandpa::grandpa_authorities(), to_authorities(vec![(4, 1), (5, 1), (6, 1)]));
assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None).is_err()); assert_noop!(
Grandpa::schedule_change(to_authorities(vec![(5, 1)]), 1, None),
Error::<Test>::ChangePending
);
Grandpa::on_finalize(8); Grandpa::on_finalize(8);
header = System::finalize(); header = System::finalize();
} }
@@ -192,7 +210,10 @@ fn dispatch_forced_change() {
assert!(!<PendingChange<Test>>::exists()); assert!(!<PendingChange<Test>>::exists());
assert_eq!(Grandpa::grandpa_authorities(), to_authorities(vec![(5, 1)])); assert_eq!(Grandpa::grandpa_authorities(), to_authorities(vec![(5, 1)]));
assert_eq!(Grandpa::next_forced(), Some(11)); assert_eq!(Grandpa::next_forced(), Some(11));
assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1), (6, 1)]), 5, Some(0)).is_err()); assert_noop!(
Grandpa::schedule_change(to_authorities(vec![(5, 1), (6, 1)]), 5, Some(0)),
Error::<Test>::TooSoon
);
Grandpa::on_finalize(i); Grandpa::on_finalize(i);
header = System::finalize(); header = System::finalize();
} }
@@ -200,7 +221,7 @@ fn dispatch_forced_change() {
{ {
initialize_block(11, header.hash()); initialize_block(11, header.hash());
assert!(!<PendingChange<Test>>::exists()); assert!(!<PendingChange<Test>>::exists());
assert!(Grandpa::schedule_change(to_authorities(vec![(5, 1), (6, 1), (7, 1)]), 5, Some(0)).is_ok()); assert_ok!(Grandpa::schedule_change(to_authorities(vec![(5, 1), (6, 1), (7, 1)]), 5, Some(0)));
assert_eq!(Grandpa::next_forced(), Some(21)); assert_eq!(Grandpa::next_forced(), Some(21));
Grandpa::on_finalize(11); Grandpa::on_finalize(11);
header = System::finalize(); header = System::finalize();
@@ -231,7 +252,7 @@ fn schedule_pause_only_when_live() {
initialize_block(2, Default::default()); initialize_block(2, Default::default());
// signaling a pause now should fail // signaling a pause now should fail
assert!(Grandpa::schedule_pause(1).is_err()); assert_noop!(Grandpa::schedule_pause(1), Error::<Test>::PauseFailed);
Grandpa::on_finalize(2); Grandpa::on_finalize(2);
let _ = System::finalize(); let _ = System::finalize();
@@ -250,7 +271,7 @@ fn schedule_resume_only_when_paused() {
initialize_block(1, Default::default()); initialize_block(1, Default::default());
// the set is currently live, resuming it is an error // the set is currently live, resuming it is an error
assert!(Grandpa::schedule_resume(1).is_err()); assert_noop!(Grandpa::schedule_resume(1), Error::<Test>::ResumeFailed);
assert_eq!( assert_eq!(
Grandpa::state(), Grandpa::state(),
substrate/frame/system/src/extensions/check_nonce.rs
+16 -6
View File
@@ -120,6 +120,7 @@ impl<T: Config> SignedExtension for CheckNonce<T> where
mod tests { mod tests {
use super::*; use super::*;
use crate::mock::{Test, new_test_ext, CALL}; use crate::mock::{Test, new_test_ext, CALL};
use frame_support::{assert_noop, assert_ok};
#[test] #[test]
fn signed_ext_check_nonce_works() { fn signed_ext_check_nonce_works() {
@@ -134,14 +135,23 @@ mod tests {
let info = DispatchInfo::default(); let info = DispatchInfo::default();
let len = 0_usize; let len = 0_usize;
// stale // stale
assert!(CheckNonce::<Test>(0).validate(&1, CALL, &info, len).is_err()); assert_noop!(
assert!(CheckNonce::<Test>(0).pre_dispatch(&1, CALL, &info, len).is_err()); CheckNonce::<Test>(0).validate(&1, CALL, &info, len),
InvalidTransaction::Stale
);
assert_noop!(
CheckNonce::<Test>(0).pre_dispatch(&1, CALL, &info, len),
InvalidTransaction::Stale
);
// correct // correct
assert!(CheckNonce::<Test>(1).validate(&1, CALL, &info, len).is_ok()); assert_ok!(CheckNonce::<Test>(1).validate(&1, CALL, &info, len));
assert!(CheckNonce::<Test>(1).pre_dispatch(&1, CALL, &info, len).is_ok()); assert_ok!(CheckNonce::<Test>(1).pre_dispatch(&1, CALL, &info, len));
// future // future
assert!(CheckNonce::<Test>(5).validate(&1, CALL, &info, len).is_ok()); assert_ok!(CheckNonce::<Test>(5).validate(&1, CALL, &info, len));
assert!(CheckNonce::<Test>(5).pre_dispatch(&1, CALL, &info, len).is_err()); assert_noop!(
CheckNonce::<Test>(5).pre_dispatch(&1, CALL, &info, len),
InvalidTransaction::Future
);
}) })
} }
} }
substrate/frame/system/src/extensions/check_weight.rs
+24 -38
View File
@@ -26,7 +26,7 @@ use sp_runtime::{
DispatchResult, DispatchResult,
}; };
use frame_support::{ use frame_support::{
traits::{Get}, traits::Get,
weights::{PostDispatchInfo, DispatchInfo, DispatchClass, priority::FrameTransactionPriority}, weights::{PostDispatchInfo, DispatchInfo, DispatchClass, priority::FrameTransactionPriority},
}; };
@@ -281,8 +281,7 @@ mod tests {
use crate::{BlockWeight, AllExtrinsicsLen}; use crate::{BlockWeight, AllExtrinsicsLen};
use crate::mock::{Test, CALL, new_test_ext, System}; use crate::mock::{Test, CALL, new_test_ext, System};
use sp_std::marker::PhantomData; use sp_std::marker::PhantomData;
use frame_support::{assert_ok, assert_noop}; use frame_support::{assert_err, assert_ok, weights::{Weight, Pays}};
use frame_support::weights::{Weight, Pays};
fn block_weights() -> crate::limits::BlockWeights { fn block_weights() -> crate::limits::BlockWeights {
<Test as crate::Config>::BlockWeights::get() <Test as crate::Config>::BlockWeights::get()
@@ -335,11 +334,7 @@ mod tests {
..Default::default() ..Default::default()
}; };
let len = 0_usize; let len = 0_usize;
assert_err!(CheckWeight::<Test>::do_validate(&max, len), InvalidTransaction::ExhaustsResources);
assert_noop!(
CheckWeight::<Test>::do_validate(&max, len),
InvalidTransaction::ExhaustsResources
);
}); });
} }
@@ -371,10 +366,7 @@ mod tests {
..Default::default() ..Default::default()
}) })
); );
assert_noop!( assert_err!(CheckWeight::<Test>::do_validate(&max, len), InvalidTransaction::ExhaustsResources);
CheckWeight::<Test>::do_validate(&max, len),
InvalidTransaction::ExhaustsResources
);
}); });
} }
@@ -437,15 +429,13 @@ mod tests {
let dispatch_operational = DispatchInfo { weight: 251, class: DispatchClass::Operational, ..Default::default() }; let dispatch_operational = DispatchInfo { weight: 251, class: DispatchClass::Operational, ..Default::default() };
let len = 0_usize; let len = 0_usize;
assert_noop!( assert_err!( CheckWeight::<Test>::do_pre_dispatch(&dispatch_normal, len),
CheckWeight::<Test>::do_pre_dispatch(&dispatch_normal, len),
InvalidTransaction::ExhaustsResources InvalidTransaction::ExhaustsResources
); );
// Thank goodness we can still do an operational transaction to possibly save the blockchain. // Thank goodness we can still do an operational transaction to possibly save the blockchain.
assert_ok!(CheckWeight::<Test>::do_pre_dispatch(&dispatch_operational, len)); assert_ok!(CheckWeight::<Test>::do_pre_dispatch(&dispatch_operational, len));
// Not too much though // Not too much though
assert_noop!( assert_err!(CheckWeight::<Test>::do_pre_dispatch(&dispatch_operational, len),
CheckWeight::<Test>::do_pre_dispatch(&dispatch_operational, len),
InvalidTransaction::ExhaustsResources InvalidTransaction::ExhaustsResources
); );
// Even with full block, validity of single transaction should be correct. // Even with full block, validity of single transaction should be correct.
@@ -466,15 +456,19 @@ mod tests {
current_weight.set(normal_limit, DispatchClass::Normal) current_weight.set(normal_limit, DispatchClass::Normal)
}); });
// will not fit. // will not fit.
assert!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &normal, len).is_err()); assert_err!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &normal, len),
InvalidTransaction::ExhaustsResources
);
// will fit. // will fit.
assert!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &op, len).is_ok()); assert_ok!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &op, len));
// likewise for length limit. // likewise for length limit.
let len = 100_usize; let len = 100_usize;
AllExtrinsicsLen::<Test>::put(normal_length_limit()); AllExtrinsicsLen::<Test>::put(normal_length_limit());
assert!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &normal, len).is_err()); assert_err!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &normal, len),
assert!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &op, len).is_ok()); InvalidTransaction::ExhaustsResources
);
assert_ok!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &op, len));
}) })
} }
@@ -575,10 +569,7 @@ mod tests {
let pre = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &info, len).unwrap(); let pre = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &info, len).unwrap();
assert_eq!(BlockWeight::<Test>::get().total(), info.weight + 256); assert_eq!(BlockWeight::<Test>::get().total(), info.weight + 256);
assert!( assert_ok!( CheckWeight::<Test>::post_dispatch(pre, &info, &post_info, len, &Ok(())));
CheckWeight::<Test>::post_dispatch(pre, &info, &post_info, len, &Ok(()))
.is_ok()
);
assert_eq!( assert_eq!(
BlockWeight::<Test>::get().total(), BlockWeight::<Test>::get().total(),
post_info.actual_weight.unwrap() + 256, post_info.actual_weight.unwrap() + 256,
@@ -607,10 +598,7 @@ mod tests {
info.weight + 128 + block_weights().get(DispatchClass::Normal).base_extrinsic, info.weight + 128 + block_weights().get(DispatchClass::Normal).base_extrinsic,
); );
assert!( assert_ok!(CheckWeight::<Test>::post_dispatch(pre, &info, &post_info, len, &Ok(())));
CheckWeight::<Test>::post_dispatch(pre, &info, &post_info, len, &Ok(()))
.is_ok()
);
assert_eq!( assert_eq!(
BlockWeight::<Test>::get().total(), BlockWeight::<Test>::get().total(),
info.weight + 128 + block_weights().get(DispatchClass::Normal).base_extrinsic, info.weight + 128 + block_weights().get(DispatchClass::Normal).base_extrinsic,
@@ -630,8 +618,7 @@ mod tests {
System::block_weight().total(), System::block_weight().total(),
weights.base_block weights.base_block
); );
let r = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &free, len); assert_ok!(CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &free, len));
assert!(r.is_ok());
assert_eq!( assert_eq!(
System::block_weight().total(), System::block_weight().total(),
weights.get(DispatchClass::Normal).base_extrinsic + weights.base_block weights.get(DispatchClass::Normal).base_extrinsic + weights.base_block
@@ -687,15 +674,14 @@ mod tests {
let mandatory2 = DispatchInfo { weight: 6, class: DispatchClass::Mandatory, ..Default::default() }; let mandatory2 = DispatchInfo { weight: 6, class: DispatchClass::Mandatory, ..Default::default() };
// when // when
let result1 = calculate_consumed_weight::<<Test as Config>::Call>( assert_ok!(
maximum_weight.clone(), all_weight.clone(), &mandatory1 calculate_consumed_weight::<<Test as Config>::Call>(
maximum_weight.clone(), all_weight.clone(), &mandatory1
)
); );
let result2 = calculate_consumed_weight::<<Test as Config>::Call>( assert_err!(
maximum_weight, all_weight, &mandatory2 calculate_consumed_weight::<<Test as Config>::Call>( maximum_weight, all_weight, &mandatory2),
InvalidTransaction::ExhaustsResources
); );
// then
assert!(result2.is_err());
assert!(result1.is_ok());
} }
} }
substrate/frame/system/src/tests.rs
+10 -8
View File
@@ -19,7 +19,9 @@ use crate::*;
use mock::{*, Origin}; use mock::{*, Origin};
use sp_core::H256; use sp_core::H256;
use sp_runtime::{DispatchError, DispatchErrorWithPostInfo, traits::{Header, BlakeTwo256}}; use sp_runtime::{DispatchError, DispatchErrorWithPostInfo, traits::{Header, BlakeTwo256}};
use frame_support::{assert_noop, weights::WithPostDispatchInfo, dispatch::PostDispatchInfo}; use frame_support::{
assert_noop, assert_ok, weights::WithPostDispatchInfo, dispatch::PostDispatchInfo
};
#[test] #[test]
fn origin_works() { fn origin_works() {
@@ -31,7 +33,7 @@ fn origin_works() {
#[test] #[test]
fn stored_map_works() { fn stored_map_works() {
new_test_ext().execute_with(|| { new_test_ext().execute_with(|| {
assert!(System::insert(&0, 42).is_ok()); assert_ok!(System::insert(&0, 42));
assert!(!System::is_provider_required(&0)); assert!(!System::is_provider_required(&0));
assert_eq!(Account::<Test>::get(0), AccountInfo { assert_eq!(Account::<Test>::get(0), AccountInfo {
@@ -42,17 +44,17 @@ fn stored_map_works() {
data: 42, data: 42,
}); });
assert!(System::inc_consumers(&0).is_ok()); assert_ok!(System::inc_consumers(&0));
assert!(System::is_provider_required(&0)); assert!(System::is_provider_required(&0));
assert!(System::insert(&0, 69).is_ok()); assert_ok!(System::insert(&0, 69));
assert!(System::is_provider_required(&0)); assert!(System::is_provider_required(&0));
System::dec_consumers(&0); System::dec_consumers(&0);
assert!(!System::is_provider_required(&0)); assert!(!System::is_provider_required(&0));
assert!(KILLED.with(|r| r.borrow().is_empty())); assert!(KILLED.with(|r| r.borrow().is_empty()));
assert!(System::remove(&0).is_ok()); assert_ok!(System::remove(&0));
assert_eq!(KILLED.with(|r| r.borrow().clone()), vec![0u64]); assert_eq!(KILLED.with(|r| r.borrow().clone()), vec![0u64]);
}); });
} }
@@ -122,7 +124,7 @@ fn sufficient_cannot_support_consumer() {
assert_noop!(System::inc_consumers(&0), IncRefError::NoProviders); assert_noop!(System::inc_consumers(&0), IncRefError::NoProviders);
assert_eq!(System::inc_providers(&0), IncRefStatus::Existed); assert_eq!(System::inc_providers(&0), IncRefStatus::Existed);
assert!(System::inc_consumers(&0).is_ok()); assert_ok!(System::inc_consumers(&0));
assert_noop!(System::dec_providers(&0), DecRefError::ConsumerRemaining); assert_noop!(System::dec_providers(&0), DecRefError::ConsumerRemaining);
}); });
} }
@@ -140,7 +142,7 @@ fn provider_required_to_support_consumer() {
assert_eq!(System::dec_providers(&0).unwrap(), DecRefStatus::Exists); assert_eq!(System::dec_providers(&0).unwrap(), DecRefStatus::Exists);
assert_eq!(System::account_nonce(&0), 1); assert_eq!(System::account_nonce(&0), 1);
assert!(System::inc_consumers(&0).is_ok()); assert_ok!(System::inc_consumers(&0));
assert_noop!(System::dec_providers(&0), DecRefError::ConsumerRemaining); assert_noop!(System::dec_providers(&0), DecRefError::ConsumerRemaining);
System::dec_consumers(&0); System::dec_consumers(&0);
@@ -516,7 +518,7 @@ fn ensure_one_of_works() {
assert_eq!(ensure_root_or_signed(RawOrigin::Root).unwrap(), Either::Left(())); assert_eq!(ensure_root_or_signed(RawOrigin::Root).unwrap(), Either::Left(()));
assert_eq!(ensure_root_or_signed(RawOrigin::Signed(0)).unwrap(), Either::Right(0)); assert_eq!(ensure_root_or_signed(RawOrigin::Signed(0)).unwrap(), Either::Right(0));
assert!(ensure_root_or_signed(RawOrigin::None).is_err()) assert!(ensure_root_or_signed(RawOrigin::None).is_err());
} }
#[test] #[test]
substrate/frame/transaction-payment/src/lib.rs
+15 -23
View File
@@ -604,7 +604,7 @@ mod tests {
use frame_system as system; use frame_system as system;
use codec::Encode; use codec::Encode;
use frame_support::{ use frame_support::{
parameter_types, assert_noop, assert_ok, parameter_types,
weights::{ weights::{
DispatchClass, DispatchInfo, PostDispatchInfo, GetDispatchInfo, Weight, DispatchClass, DispatchInfo, PostDispatchInfo, GetDispatchInfo, Weight,
WeightToFeePolynomial, WeightToFeeCoefficients, WeightToFeeCoefficient, WeightToFeePolynomial, WeightToFeeCoefficients, WeightToFeeCoefficient,
@@ -616,6 +616,7 @@ mod tests {
use sp_runtime::{ use sp_runtime::{
testing::{Header, TestXt}, testing::{Header, TestXt},
traits::{BlakeTwo256, IdentityLookup}, traits::{BlakeTwo256, IdentityLookup},
transaction_validity::InvalidTransaction,
Perbill, Perbill,
}; };
use std::cell::RefCell; use std::cell::RefCell;
@@ -826,10 +827,9 @@ mod tests {
.unwrap(); .unwrap();
assert_eq!(Balances::free_balance(1), 100 - 5 - 5 - 10); assert_eq!(Balances::free_balance(1), 100 - 5 - 5 - 10);
assert!( assert_ok!(
ChargeTransactionPayment::<Runtime> ChargeTransactionPayment::<Runtime>
::post_dispatch(pre, &info_from_weight(5), &default_post_info(), len, &Ok(())) ::post_dispatch(pre, &info_from_weight(5), &default_post_info(), len, &Ok(()))
.is_ok()
); );
assert_eq!(Balances::free_balance(1), 100 - 5 - 5 - 10); assert_eq!(Balances::free_balance(1), 100 - 5 - 5 - 10);
@@ -838,10 +838,9 @@ mod tests {
.unwrap(); .unwrap();
assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5); assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5);
assert!( assert_ok!(
ChargeTransactionPayment::<Runtime> ChargeTransactionPayment::<Runtime>
::post_dispatch(pre, &info_from_weight(100), &post_info_from_weight(50), len, &Ok(())) ::post_dispatch(pre, &info_from_weight(100), &post_info_from_weight(50), len, &Ok(()))
.is_ok()
); );
assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 50 - 5); assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 50 - 5);
}); });
@@ -864,10 +863,9 @@ mod tests {
// 5 base fee, 10 byte fee, 3/2 * 100 weight fee, 5 tip // 5 base fee, 10 byte fee, 3/2 * 100 weight fee, 5 tip
assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 150 - 5); assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 150 - 5);
assert!( assert_ok!(
ChargeTransactionPayment::<Runtime> ChargeTransactionPayment::<Runtime>
::post_dispatch(pre, &info_from_weight(100), &post_info_from_weight(50), len, &Ok(())) ::post_dispatch(pre, &info_from_weight(100), &post_info_from_weight(50), len, &Ok(()))
.is_ok()
); );
// 75 (3/2 of the returned 50 units of weight) is refunded // 75 (3/2 of the returned 50 units of weight) is refunded
assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 75 - 5); assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 75 - 5);
@@ -883,10 +881,9 @@ mod tests {
.execute_with(|| .execute_with(||
{ {
// maximum weight possible // maximum weight possible
assert!( assert_ok!(
ChargeTransactionPayment::<Runtime>::from(0) ChargeTransactionPayment::<Runtime>::from(0)
.pre_dispatch(&1, CALL, &info_from_weight(Weight::max_value()), 10) .pre_dispatch(&1, CALL, &info_from_weight(Weight::max_value()), 10)
.is_ok()
); );
// fee will be proportional to what is the actual maximum weight in the runtime. // fee will be proportional to what is the actual maximum weight in the runtime.
assert_eq!( assert_eq!(
@@ -915,10 +912,9 @@ mod tests {
class: DispatchClass::Operational, class: DispatchClass::Operational,
pays_fee: Pays::No, pays_fee: Pays::No,
}; };
assert!( assert_ok!(
ChargeTransactionPayment::<Runtime>::from(0) ChargeTransactionPayment::<Runtime>::from(0)
.validate(&1, CALL, &operational_transaction , len) .validate(&1, CALL, &operational_transaction , len)
.is_ok()
); );
// like a InsecureFreeNormal // like a InsecureFreeNormal
@@ -927,10 +923,10 @@ mod tests {
class: DispatchClass::Normal, class: DispatchClass::Normal,
pays_fee: Pays::Yes, pays_fee: Pays::Yes,
}; };
assert!( assert_noop!(
ChargeTransactionPayment::<Runtime>::from(0) ChargeTransactionPayment::<Runtime>::from(0)
.validate(&1, CALL, &free_transaction , len) .validate(&1, CALL, &free_transaction , len),
.is_err() TransactionValidityError::Invalid(InvalidTransaction::Payment),
); );
}); });
} }
@@ -947,10 +943,9 @@ mod tests {
NextFeeMultiplier::put(Multiplier::saturating_from_rational(3, 2)); NextFeeMultiplier::put(Multiplier::saturating_from_rational(3, 2));
let len = 10; let len = 10;
assert!( assert_ok!(
ChargeTransactionPayment::<Runtime>::from(10) // tipped ChargeTransactionPayment::<Runtime>::from(10) // tipped
.pre_dispatch(&1, CALL, &info_from_weight(3), len) .pre_dispatch(&1, CALL, &info_from_weight(3), len)
.is_ok()
); );
assert_eq!( assert_eq!(
Balances::free_balance(1), Balances::free_balance(1),
@@ -1146,13 +1141,12 @@ mod tests {
assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5); assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5);
// kill the account between pre and post dispatch // kill the account between pre and post dispatch
assert!(Balances::transfer(Some(2).into(), 3, Balances::free_balance(2)).is_ok()); assert_ok!(Balances::transfer(Some(2).into(), 3, Balances::free_balance(2)));
assert_eq!(Balances::free_balance(2), 0); assert_eq!(Balances::free_balance(2), 0);
assert!( assert_ok!(
ChargeTransactionPayment::<Runtime> ChargeTransactionPayment::<Runtime>
::post_dispatch(pre, &info_from_weight(100), &post_info_from_weight(50), len, &Ok(())) ::post_dispatch(pre, &info_from_weight(100), &post_info_from_weight(50), len, &Ok(()))
.is_ok()
); );
assert_eq!(Balances::free_balance(2), 0); assert_eq!(Balances::free_balance(2), 0);
// Transfer Event // Transfer Event
@@ -1180,10 +1174,9 @@ mod tests {
.unwrap(); .unwrap();
assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5); assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5);
assert!( assert_ok!(
ChargeTransactionPayment::<Runtime> ChargeTransactionPayment::<Runtime>
::post_dispatch(pre, &info_from_weight(100), &post_info_from_weight(101), len, &Ok(())) ::post_dispatch(pre, &info_from_weight(100), &post_info_from_weight(101), len, &Ok(()))
.is_ok()
); );
assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5); assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5);
}); });
@@ -1210,10 +1203,9 @@ mod tests {
.pre_dispatch(&user, CALL, &dispatch_info, len) .pre_dispatch(&user, CALL, &dispatch_info, len)
.unwrap(); .unwrap();
assert_eq!(Balances::total_balance(&user), 0); assert_eq!(Balances::total_balance(&user), 0);
assert!( assert_ok!(
ChargeTransactionPayment::<Runtime> ChargeTransactionPayment::<Runtime>
::post_dispatch(pre, &dispatch_info, &default_post_info(), len, &Ok(())) ::post_dispatch(pre, &dispatch_info, &default_post_info(), len, &Ok(()))
.is_ok()
); );
assert_eq!(Balances::total_balance(&user), 0); assert_eq!(Balances::total_balance(&user), 0);
// No events for such a scenario // No events for such a scenario