Companion for #11124 (#5615)

* Bump

* Formatting
This commit is contained in:
Gavin Wood
2022-05-31 11:59:54 +01:00
committed by GitHub
parent 72723c8a9f
commit 5f350d4d69
7 changed files with 214 additions and 196 deletions
+2 -2
View File
@@ -679,7 +679,7 @@ mod tests {
assert_noop, assert_ok, assert_storage_noop,
dispatch::DispatchError::BadOrigin,
ord_parameter_types, parameter_types,
traits::{EnsureOneOf, OnFinalize, OnInitialize},
traits::{EitherOfDiverse, OnFinalize, OnInitialize},
};
use frame_system::{EnsureRoot, EnsureSignedBy};
use pallet_balances;
@@ -842,7 +842,7 @@ mod tests {
pub const Six: u64 = 6;
}
type RootOrSix = EnsureOneOf<EnsureRoot<u64>, EnsureSignedBy<Six, u64>>;
type RootOrSix = EitherOfDiverse<EnsureRoot<u64>, EnsureSignedBy<Six, u64>>;
thread_local! {
pub static LAST_RANDOM: RefCell<Option<(H256, u32)>> = RefCell::new(None);
+1
View File
@@ -164,6 +164,7 @@ mod tests {
type SpendFunds = ();
type MaxApprovals = MaxApprovals;
type WeightInfo = ();
type SpendOrigin = frame_support::traits::NeverEnsureOrigin<u64>;
}
pub struct OneAuthor;