mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-13 16:21:06 +00:00
Run cargo fmt on the whole code base (#9394)
* Run cargo fmt on the whole code base * Second run * Add CI check * Fix compilation * More unnecessary braces * Handle weights * Use --all * Use correct attributes... * Fix UI tests * AHHHHHHHHH * 🤦 * Docs * Fix compilation * 🤷 * Please stop * 🤦 x 2 * More * make rustfmt.toml consistent with polkadot Co-authored-by: André Silva <andrerfosilva@gmail.com>
This commit is contained in:
@@ -23,12 +23,12 @@
|
||||
// Ensure we're `no_std` when compiling for Wasm.
|
||||
#![cfg_attr(not(feature = "std"), no_std)]
|
||||
|
||||
use sp_std::prelude::*;
|
||||
use frame_support::{
|
||||
decl_module, decl_storage, decl_event, decl_error,
|
||||
traits::{ChangeMembers, InitializeMembers, EnsureOrigin, Contains, SortedMembers, Get},
|
||||
decl_error, decl_event, decl_module, decl_storage,
|
||||
traits::{ChangeMembers, Contains, EnsureOrigin, Get, InitializeMembers, SortedMembers},
|
||||
};
|
||||
use frame_system::ensure_signed;
|
||||
use sp_std::prelude::*;
|
||||
|
||||
pub mod weights;
|
||||
pub use weights::WeightInfo;
|
||||
@@ -321,10 +321,10 @@ impl<T: Config<I>, I: Instance> SortedMembers<T::AccountId> for Module<T, I> {
|
||||
|
||||
#[cfg(feature = "runtime-benchmarks")]
|
||||
mod benchmark {
|
||||
use super::{*, Module as Membership};
|
||||
use super::{Module as Membership, *};
|
||||
use frame_benchmarking::{account, benchmarks_instance, impl_benchmark_test_suite, whitelist};
|
||||
use frame_support::{assert_ok, traits::EnsureOrigin};
|
||||
use frame_system::RawOrigin;
|
||||
use frame_support::{traits::EnsureOrigin, assert_ok};
|
||||
use frame_benchmarking::{benchmarks_instance, whitelist, account, impl_benchmark_test_suite};
|
||||
|
||||
const SEED: u32 = 0;
|
||||
|
||||
@@ -467,10 +467,13 @@ mod tests {
|
||||
use super::*;
|
||||
use crate as pallet_membership;
|
||||
|
||||
use frame_support::{assert_ok, assert_noop, parameter_types, ord_parameter_types};
|
||||
use sp_core::H256;
|
||||
use sp_runtime::{traits::{BlakeTwo256, IdentityLookup, BadOrigin}, testing::Header};
|
||||
use frame_support::{assert_noop, assert_ok, ord_parameter_types, parameter_types};
|
||||
use frame_system::EnsureSignedBy;
|
||||
use sp_core::H256;
|
||||
use sp_runtime::{
|
||||
testing::Header,
|
||||
traits::{BadOrigin, BlakeTwo256, IdentityLookup},
|
||||
};
|
||||
|
||||
type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
|
||||
type Block = frame_system::mocking::MockBlock<Test>;
|
||||
@@ -572,10 +575,12 @@ mod tests {
|
||||
pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
|
||||
let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
|
||||
// We use default for brevity, but you can configure as desired if needed.
|
||||
pallet_membership::GenesisConfig::<Test>{
|
||||
pallet_membership::GenesisConfig::<Test> {
|
||||
members: vec![10, 20, 30],
|
||||
.. Default::default()
|
||||
}.assimilate_storage(&mut t).unwrap();
|
||||
..Default::default()
|
||||
}
|
||||
.assimilate_storage(&mut t)
|
||||
.unwrap();
|
||||
t.into()
|
||||
}
|
||||
|
||||
@@ -617,7 +622,10 @@ mod tests {
|
||||
fn add_member_works() {
|
||||
new_test_ext().execute_with(|| {
|
||||
assert_noop!(Membership::add_member(Origin::signed(5), 15), BadOrigin);
|
||||
assert_noop!(Membership::add_member(Origin::signed(1), 10), Error::<Test, _>::AlreadyMember);
|
||||
assert_noop!(
|
||||
Membership::add_member(Origin::signed(1), 10),
|
||||
Error::<Test, _>::AlreadyMember
|
||||
);
|
||||
assert_ok!(Membership::add_member(Origin::signed(1), 15));
|
||||
assert_eq!(Membership::members(), vec![10, 15, 20, 30]);
|
||||
assert_eq!(MEMBERS.with(|m| m.borrow().clone()), Membership::members());
|
||||
@@ -628,7 +636,10 @@ mod tests {
|
||||
fn remove_member_works() {
|
||||
new_test_ext().execute_with(|| {
|
||||
assert_noop!(Membership::remove_member(Origin::signed(5), 20), BadOrigin);
|
||||
assert_noop!(Membership::remove_member(Origin::signed(2), 15), Error::<Test, _>::NotMember);
|
||||
assert_noop!(
|
||||
Membership::remove_member(Origin::signed(2), 15),
|
||||
Error::<Test, _>::NotMember
|
||||
);
|
||||
assert_ok!(Membership::set_prime(Origin::signed(5), 20));
|
||||
assert_ok!(Membership::remove_member(Origin::signed(2), 20));
|
||||
assert_eq!(Membership::members(), vec![10, 30]);
|
||||
@@ -642,8 +653,14 @@ mod tests {
|
||||
fn swap_member_works() {
|
||||
new_test_ext().execute_with(|| {
|
||||
assert_noop!(Membership::swap_member(Origin::signed(5), 10, 25), BadOrigin);
|
||||
assert_noop!(Membership::swap_member(Origin::signed(3), 15, 25), Error::<Test, _>::NotMember);
|
||||
assert_noop!(Membership::swap_member(Origin::signed(3), 10, 30), Error::<Test, _>::AlreadyMember);
|
||||
assert_noop!(
|
||||
Membership::swap_member(Origin::signed(3), 15, 25),
|
||||
Error::<Test, _>::NotMember
|
||||
);
|
||||
assert_noop!(
|
||||
Membership::swap_member(Origin::signed(3), 10, 30),
|
||||
Error::<Test, _>::AlreadyMember
|
||||
);
|
||||
|
||||
assert_ok!(Membership::set_prime(Origin::signed(5), 20));
|
||||
assert_ok!(Membership::swap_member(Origin::signed(3), 20, 20));
|
||||
@@ -673,8 +690,14 @@ mod tests {
|
||||
fn change_key_works() {
|
||||
new_test_ext().execute_with(|| {
|
||||
assert_ok!(Membership::set_prime(Origin::signed(5), 10));
|
||||
assert_noop!(Membership::change_key(Origin::signed(3), 25), Error::<Test, _>::NotMember);
|
||||
assert_noop!(Membership::change_key(Origin::signed(10), 20), Error::<Test, _>::AlreadyMember);
|
||||
assert_noop!(
|
||||
Membership::change_key(Origin::signed(3), 25),
|
||||
Error::<Test, _>::NotMember
|
||||
);
|
||||
assert_noop!(
|
||||
Membership::change_key(Origin::signed(10), 20),
|
||||
Error::<Test, _>::AlreadyMember
|
||||
);
|
||||
assert_ok!(Membership::change_key(Origin::signed(10), 40));
|
||||
assert_eq!(Membership::members(), vec![20, 30, 40]);
|
||||
assert_eq!(MEMBERS.with(|m| m.borrow().clone()), Membership::members());
|
||||
@@ -718,6 +741,8 @@ mod tests {
|
||||
pallet_membership::GenesisConfig::<Test> {
|
||||
members: vec![1, 2, 3, 1],
|
||||
phantom: Default::default(),
|
||||
}.build_storage().unwrap();
|
||||
}
|
||||
.build_storage()
|
||||
.unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
// --template=./.maintain/frame-weight-template.hbs
|
||||
|
||||
|
||||
#![cfg_attr(rustfmt, rustfmt_skip)]
|
||||
#![allow(unused_parens)]
|
||||
#![allow(unused_imports)]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user