From d944698d1764242c2059340fc3ab4724bdc29259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 24 Jul 2024 17:22:06 +0200 Subject: [PATCH] FMT --- substrate/frame/membership/src/mock.rs | 119 ++++++++++++------------- 1 file changed, 57 insertions(+), 62 deletions(-) diff --git a/substrate/frame/membership/src/mock.rs b/substrate/frame/membership/src/mock.rs index 2bc0532face6..2746219e095f 100644 --- a/substrate/frame/membership/src/mock.rs +++ b/substrate/frame/membership/src/mock.rs @@ -22,101 +22,96 @@ use crate as pallet_membership; use sp_runtime::{bounded_vec, BuildStorage}; -use frame_support::{ - derive_impl, ord_parameter_types, - parameter_types, - traits::{ConstU32}, -}; +use frame_support::{derive_impl, ord_parameter_types, parameter_types, traits::ConstU32}; use frame_system::EnsureSignedBy; type Block = frame_system::mocking::MockBlock; - frame_support::construct_runtime!( - pub enum Test - { - System: frame_system, - Membership: pallet_membership, - } + pub enum Test + { + System: frame_system, + Membership: pallet_membership, + } ); parameter_types! { - pub static Members: Vec = vec![]; - pub static Prime: Option = None; + pub static Members: Vec = vec![]; + pub static Prime: Option = None; } #[derive_impl(frame_system::config_preludes::TestDefaultConfig)] impl frame_system::Config for Test { - type Block = Block; + type Block = Block; } ord_parameter_types! { - pub const One: u64 = 1; - pub const Two: u64 = 2; - pub const Three: u64 = 3; - pub const Four: u64 = 4; - pub const Five: u64 = 5; + pub const One: u64 = 1; + pub const Two: u64 = 2; + pub const Three: u64 = 3; + pub const Four: u64 = 4; + pub const Five: u64 = 5; } pub struct TestChangeMembers; impl ChangeMembers for TestChangeMembers { - fn change_members_sorted(incoming: &[u64], outgoing: &[u64], new: &[u64]) { - let mut old_plus_incoming = Members::get(); - old_plus_incoming.extend_from_slice(incoming); - old_plus_incoming.sort(); - let mut new_plus_outgoing = new.to_vec(); - new_plus_outgoing.extend_from_slice(outgoing); - new_plus_outgoing.sort(); - assert_eq!(old_plus_incoming, new_plus_outgoing); - - Members::set(new.to_vec()); - Prime::set(None); - } - fn set_prime(who: Option) { - Prime::set(who); - } - fn get_prime() -> Option { - Prime::get() - } + fn change_members_sorted(incoming: &[u64], outgoing: &[u64], new: &[u64]) { + let mut old_plus_incoming = Members::get(); + old_plus_incoming.extend_from_slice(incoming); + old_plus_incoming.sort(); + let mut new_plus_outgoing = new.to_vec(); + new_plus_outgoing.extend_from_slice(outgoing); + new_plus_outgoing.sort(); + assert_eq!(old_plus_incoming, new_plus_outgoing); + + Members::set(new.to_vec()); + Prime::set(None); + } + fn set_prime(who: Option) { + Prime::set(who); + } + fn get_prime() -> Option { + Prime::get() + } } impl InitializeMembers for TestChangeMembers { - fn initialize_members(members: &[u64]) { - MEMBERS.with(|m| *m.borrow_mut() = members.to_vec()); - } + fn initialize_members(members: &[u64]) { + MEMBERS.with(|m| *m.borrow_mut() = members.to_vec()); + } } impl Config for Test { - type RuntimeEvent = RuntimeEvent; - type AddOrigin = EnsureSignedBy; - type RemoveOrigin = EnsureSignedBy; - type SwapOrigin = EnsureSignedBy; - type ResetOrigin = EnsureSignedBy; - type PrimeOrigin = EnsureSignedBy; - type MembershipInitialized = TestChangeMembers; - type MembershipChanged = TestChangeMembers; - type MaxMembers = ConstU32<10>; - type WeightInfo = (); + type RuntimeEvent = RuntimeEvent; + type AddOrigin = EnsureSignedBy; + type RemoveOrigin = EnsureSignedBy; + type SwapOrigin = EnsureSignedBy; + type ResetOrigin = EnsureSignedBy; + type PrimeOrigin = EnsureSignedBy; + type MembershipInitialized = TestChangeMembers; + type MembershipChanged = TestChangeMembers; + type MaxMembers = ConstU32<10>; + type WeightInfo = (); } pub(crate) fn new_test_ext() -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::::default().build_storage().unwrap(); - // We use default for brevity, but you can configure as desired if needed. - pallet_membership::GenesisConfig:: { - members: bounded_vec![10, 20, 30], - ..Default::default() - } - .assimilate_storage(&mut t) - .unwrap(); - t.into() + let mut t = frame_system::GenesisConfig::::default().build_storage().unwrap(); + // We use default for brevity, but you can configure as desired if needed. + pallet_membership::GenesisConfig:: { + members: bounded_vec![10, 20, 30], + ..Default::default() + } + .assimilate_storage(&mut t) + .unwrap(); + t.into() } #[cfg(feature = "runtime-benchmarks")] pub(crate) fn new_bench_ext() -> sp_io::TestExternalities { - frame_system::GenesisConfig::::default().build_storage().unwrap().into() + frame_system::GenesisConfig::::default().build_storage().unwrap().into() } #[cfg(feature = "runtime-benchmarks")] pub(crate) fn clean() { - Members::set(vec![]); - Prime::set(None); + Members::set(vec![]); + Prime::set(None); }