pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-12 22:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run cargo fmt on the whole code base (#9394)

Browse Source 
* 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:
Bastian Köcher
2021-07-21 16:32:32 +02:00
committed by GitHub
parent d451c38c1c
commit 7b56ab15b4
1010 changed files with 53339 additions and 51208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/balances/src/benchmarking.rs
+3 -2
View File
@@ -21,8 +21,10 @@
use super::*;
use frame_benchmarking::{
account, benchmarks_instance_pallet, impl_benchmark_test_suite, whitelisted_caller,
};
use frame_system::RawOrigin;
use frame_benchmarking::{benchmarks_instance_pallet, account, whitelisted_caller, impl_benchmark_test_suite};
use sp_runtime::traits::Bounded;
use crate::Pallet as Balances;
@@ -31,7 +33,6 @@ const SEED: u32 = 0;
// existential deposit multiplier
const ED_MULTIPLIER: u32 = 10;
benchmarks_instance_pallet! {
// Benchmark `transfer` extrinsic with the worst possible conditions:
// * Transfer will kill the sender account.
substrate/frame/balances/src/lib.rs
+421 -272
View File
File diff suppressed because it is too large Load Diff
substrate/frame/balances/src/tests_composite.rs
+12 -17
View File
@@ -19,19 +19,15 @@
#![cfg(test)]
use sp_runtime::{
traits::IdentityLookup,
testing::Header,
use crate::{self as pallet_balances, decl_tests, Config, Pallet};
use frame_support::{
parameter_types,
weights::{DispatchInfo, IdentityFee, Weight},
};
use pallet_transaction_payment::CurrencyAdapter;
use sp_core::H256;
use sp_io;
use frame_support::parameter_types;
use frame_support::weights::{Weight, DispatchInfo, IdentityFee};
use pallet_transaction_payment::CurrencyAdapter;
use crate::{
self as pallet_balances,
Pallet, Config, decl_tests,
};
use sp_runtime::{testing::Header, traits::IdentityLookup};
type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
type Block = frame_system::mocking::MockBlock<Test>;
@@ -110,10 +106,7 @@ pub struct ExtBuilder {
}
impl Default for ExtBuilder {
fn default() -> Self {
Self {
existential_deposit: 1,
monied: false,
}
Self { existential_deposit: 1, monied: false }
}
}
impl ExtBuilder {
@@ -138,12 +131,14 @@ impl ExtBuilder {
(2, 20 * self.existential_deposit),
(3, 30 * self.existential_deposit),
(4, 40 * self.existential_deposit),
(12, 10 * self.existential_deposit)
(12, 10 * self.existential_deposit),
]
} else {
vec![]
},
}.assimilate_storage(&mut t).unwrap();
}
.assimilate_storage(&mut t)
.unwrap();
let mut ext = sp_io::TestExternalities::new(t);
ext.execute_with(|| System::set_block_number(1));
@@ -151,4 +146,4 @@ impl ExtBuilder {
}
}
decl_tests!{ Test, ExtBuilder, EXISTENTIAL_DEPOSIT }
decl_tests! { Test, ExtBuilder, EXISTENTIAL_DEPOSIT }
substrate/frame/balances/src/tests_local.rs
+40 -52
View File
@@ -19,20 +19,16 @@
#![cfg(test)]
use sp_runtime::{
traits::IdentityLookup,
testing::Header,
};
use sp_core::H256;
use sp_io;
use frame_support::parameter_types;
use frame_support::traits::StorageMapShim;
use frame_support::weights::{Weight, DispatchInfo, IdentityFee};
use crate::{
self as pallet_balances,
Pallet, Config, decl_tests,
use crate::{self as pallet_balances, decl_tests, Config, Pallet};
use frame_support::{
parameter_types,
traits::StorageMapShim,
weights::{DispatchInfo, IdentityFee, Weight},
};
use pallet_transaction_payment::CurrencyAdapter;
use sp_core::H256;
use sp_io;
use sp_runtime::{testing::Header, traits::IdentityLookup};
type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
type Block = frame_system::mocking::MockBlock<Test>;
@@ -98,12 +94,8 @@ impl Config for Test {
type DustRemoval = ();
type Event = Event;
type ExistentialDeposit = ExistentialDeposit;
type AccountStore = StorageMapShim<
super::Account<Test>,
system::Provider<Test>,
u64,
super::AccountData<u64>,
>;
type AccountStore =
StorageMapShim<super::Account<Test>, system::Provider<Test>, u64, super::AccountData<u64>>;
type MaxLocks = MaxLocks;
type MaxReserves = MaxReserves;
type ReserveIdentifier = [u8; 8];
@@ -116,10 +108,7 @@ pub struct ExtBuilder {
}
impl Default for ExtBuilder {
fn default() -> Self {
Self {
existential_deposit: 1,
monied: false,
}
Self { existential_deposit: 1, monied: false }
}
}
impl ExtBuilder {
@@ -147,12 +136,14 @@ impl ExtBuilder {
(2, 20 * self.existential_deposit),
(3, 30 * self.existential_deposit),
(4, 40 * self.existential_deposit),
(12, 10 * self.existential_deposit)
(12, 10 * self.existential_deposit),
]
} else {
vec![]
},
}.assimilate_storage(&mut t).unwrap();
}
.assimilate_storage(&mut t)
.unwrap();
let mut ext = sp_io::TestExternalities::new(t);
ext.execute_with(|| System::set_block_number(1));
@@ -160,40 +151,37 @@ impl ExtBuilder {
}
}
decl_tests!{ Test, ExtBuilder, EXISTENTIAL_DEPOSIT }
decl_tests! { Test, ExtBuilder, EXISTENTIAL_DEPOSIT }
#[test]
fn emit_events_with_no_existential_deposit_suicide_with_dust() {
<ExtBuilder>::default()
.existential_deposit(2)
.build()
.execute_with(|| {
assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 100, 0));
<ExtBuilder>::default().existential_deposit(2).build().execute_with(|| {
assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 100, 0));
assert_eq!(
events(),
[
Event::System(system::Event::NewAccount(1)),
Event::Balances(crate::Event::Endowed(1, 100)),
Event::Balances(crate::Event::BalanceSet(1, 100, 0)),
]
);
assert_eq!(
events(),
[
Event::System(system::Event::NewAccount(1)),
Event::Balances(crate::Event::Endowed(1, 100)),
Event::Balances(crate::Event::BalanceSet(1, 100, 0)),
]
);
let res = Balances::slash(&1, 98);
assert_eq!(res, (NegativeImbalance::new(98), 0));
let res = Balances::slash(&1, 98);
assert_eq!(res, (NegativeImbalance::new(98), 0));
// no events
assert_eq!(events(), []);
// no events
assert_eq!(events(), []);
let res = Balances::slash(&1, 1);
assert_eq!(res, (NegativeImbalance::new(1), 0));
let res = Balances::slash(&1, 1);
assert_eq!(res, (NegativeImbalance::new(1), 0));
assert_eq!(
events(),
[
Event::System(system::Event::KilledAccount(1)),
Event::Balances(crate::Event::DustLost(1, 1)),
]
);
});
assert_eq!(
events(),
[
Event::System(system::Event::KilledAccount(1)),
Event::Balances(crate::Event::DustLost(1, 1)),
]
);
});
}
substrate/frame/balances/src/tests_reentrancy.rs
+84 -110
View File
@@ -19,27 +19,17 @@
#![cfg(test)]
use sp_runtime::{
traits::IdentityLookup,
testing::Header,
};
use crate::{self as pallet_balances, Config, Pallet};
use frame_support::{parameter_types, traits::StorageMapShim, weights::IdentityFee};
use pallet_transaction_payment::CurrencyAdapter;
use sp_core::H256;
use sp_io;
use frame_support::parameter_types;
use frame_support::traits::StorageMapShim;
use frame_support::weights::{IdentityFee};
use crate::{
self as pallet_balances,
Pallet, Config,
};
use pallet_transaction_payment::CurrencyAdapter;
use sp_runtime::{testing::Header, traits::IdentityLookup};
use crate::*;
use frame_support::{
assert_ok,
traits::{
Currency, ReservableCurrency,
}
traits::{Currency, ReservableCurrency},
};
use frame_system::RawOrigin;
@@ -113,12 +103,8 @@ impl Config for Test {
type DustRemoval = OnDustRemoval;
type Event = Event;
type ExistentialDeposit = ExistentialDeposit;
type AccountStore = StorageMapShim<
super::Account<Test>,
system::Provider<Test>,
u64,
super::AccountData<u64>,
>;
type AccountStore =
StorageMapShim<super::Account<Test>, system::Provider<Test>, u64, super::AccountData<u64>>;
type MaxLocks = MaxLocks;
type MaxReserves = MaxReserves;
type ReserveIdentifier = [u8; 8];
@@ -130,13 +116,10 @@ pub struct ExtBuilder {
}
impl Default for ExtBuilder {
fn default() -> Self {
Self {
existential_deposit: 1,
}
Self { existential_deposit: 1 }
}
}
impl ExtBuilder {
pub fn existential_deposit(mut self, existential_deposit: u64) -> Self {
self.existential_deposit = existential_deposit;
self
@@ -149,9 +132,9 @@ impl ExtBuilder {
pub fn build(self) -> sp_io::TestExternalities {
self.set_associated_consts();
let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
pallet_balances::GenesisConfig::<Test> {
balances: vec![],
}.assimilate_storage(&mut t).unwrap();
pallet_balances::GenesisConfig::<Test> { balances: vec![] }
.assimilate_storage(&mut t)
.unwrap();
let mut ext = sp_io::TestExternalities::new(t);
ext.execute_with(|| System::set_block_number(1));
ext
@@ -160,112 +143,103 @@ impl ExtBuilder {
#[test]
fn transfer_dust_removal_tst1_should_work() {
ExtBuilder::default()
.existential_deposit(100)
.build()
.execute_with(|| {
// Verification of reentrancy in dust removal
assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 1000, 0));
assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 2, 500, 0));
ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
// Verification of reentrancy in dust removal
assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 1000, 0));
assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 2, 500, 0));
// In this transaction, account 2 free balance
// drops below existential balance
// and dust balance is removed from account 2
assert_ok!(Balances::transfer(RawOrigin::Signed(2).into(), 3, 450));
// In this transaction, account 2 free balance
// drops below existential balance
// and dust balance is removed from account 2
assert_ok!(Balances::transfer(RawOrigin::Signed(2).into(), 3, 450));
// As expected dust balance is removed.
assert_eq!(Balances::free_balance(&2), 0);
// As expected dust balance is removed.
assert_eq!(Balances::free_balance(&2), 0);
// As expected beneficiary account 3
// received the transfered fund.
assert_eq!(Balances::free_balance(&3), 450);
// As expected beneficiary account 3
// received the transfered fund.
assert_eq!(Balances::free_balance(&3), 450);
// Dust balance is deposited to account 1
// during the process of dust removal.
assert_eq!(Balances::free_balance(&1), 1050);
// Dust balance is deposited to account 1
// during the process of dust removal.
assert_eq!(Balances::free_balance(&1), 1050);
// Verify the events
// Number of events expected is 8
assert_eq!(System::events().len(), 11);
// Verify the events
// Number of events expected is 8
assert_eq!(System::events().len(), 11);
System::assert_has_event(Event::Balances(crate::Event::Transfer(2, 3, 450)));
System::assert_has_event(Event::Balances(crate::Event::DustLost(2, 50)));
}
);
System::assert_has_event(Event::Balances(crate::Event::Transfer(2, 3, 450)));
System::assert_has_event(Event::Balances(crate::Event::DustLost(2, 50)));
});
}
#[test]
fn transfer_dust_removal_tst2_should_work() {
ExtBuilder::default()
.existential_deposit(100)
.build()
.execute_with(|| {
// Verification of reentrancy in dust removal
assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 1000, 0));
assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 2, 500, 0));
ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
// Verification of reentrancy in dust removal
assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 1000, 0));
assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 2, 500, 0));
// In this transaction, account 2 free balance
// drops below existential balance
// and dust balance is removed from account 2
assert_ok!(Balances::transfer(RawOrigin::Signed(2).into(), 1, 450));
// In this transaction, account 2 free balance
// drops below existential balance
// and dust balance is removed from account 2
assert_ok!(Balances::transfer(RawOrigin::Signed(2).into(), 1, 450));
// As expected dust balance is removed.
assert_eq!(Balances::free_balance(&2), 0);
// As expected dust balance is removed.
assert_eq!(Balances::free_balance(&2), 0);
// Dust balance is deposited to account 1
// during the process of dust removal.
assert_eq!(Balances::free_balance(&1), 1500);
// Dust balance is deposited to account 1
// during the process of dust removal.
assert_eq!(Balances::free_balance(&1), 1500);
// Verify the events
// Number of events expected is 8
assert_eq!(System::events().len(), 9);
// Verify the events
// Number of events expected is 8
assert_eq!(System::events().len(), 9);
System::assert_has_event(Event::Balances(crate::Event::Transfer(2, 1, 450)));
System::assert_has_event(Event::Balances(crate::Event::DustLost(2, 50)));
}
);
System::assert_has_event(Event::Balances(crate::Event::Transfer(2, 1, 450)));
System::assert_has_event(Event::Balances(crate::Event::DustLost(2, 50)));
});
}
#[test]
fn repatriating_reserved_balance_dust_removal_should_work() {
ExtBuilder::default()
.existential_deposit(100)
.build()
.execute_with(|| {
// Verification of reentrancy in dust removal
assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 1000, 0));
assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 2, 500, 0));
ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
// Verification of reentrancy in dust removal
assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 1000, 0));
assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 2, 500, 0));
// Reserve a value on account 2,
// Such that free balance is lower than
// Exestintial deposit.
assert_ok!(Balances::reserve(&2, 450));
// Reserve a value on account 2,
// Such that free balance is lower than
// Exestintial deposit.
assert_ok!(Balances::reserve(&2, 450));
// Transfer of reserved fund from slashed account 2 to
// beneficiary account 1
assert_ok!(Balances::repatriate_reserved(&2, &1, 450, Status::Free), 0);
// Transfer of reserved fund from slashed account 2 to
// beneficiary account 1
assert_ok!(Balances::repatriate_reserved(&2, &1, 450, Status::Free), 0);
// Since free balance of account 2 is lower than
// existential deposit, dust amount is
// removed from the account 2
assert_eq!(Balances::reserved_balance(2), 0);
assert_eq!(Balances::free_balance(2), 0);
// Since free balance of account 2 is lower than
// existential deposit, dust amount is
// removed from the account 2
assert_eq!(Balances::reserved_balance(2), 0);
assert_eq!(Balances::free_balance(2), 0);
// account 1 is credited with reserved amount
// together with dust balance during dust
// removal.
assert_eq!(Balances::reserved_balance(1), 0);
assert_eq!(Balances::free_balance(1), 1500);
// account 1 is credited with reserved amount
// together with dust balance during dust
// removal.
assert_eq!(Balances::reserved_balance(1), 0);
assert_eq!(Balances::free_balance(1), 1500);
// Verify the events
// Number of events expected is 10
assert_eq!(System::events().len(), 10);
// Verify the events
// Number of events expected is 10
assert_eq!(System::events().len(), 10);
System::assert_has_event(Event::Balances(
crate::Event::ReserveRepatriated(2, 1, 450, Status::Free),
));
System::assert_has_event(Event::Balances(crate::Event::ReserveRepatriated(
2,
1,
450,
Status::Free,
)));
System::assert_last_event(Event::Balances(crate::Event::DustLost(2, 50)));
}
);
System::assert_last_event(Event::Balances(crate::Event::DustLost(2, 50)));
});
}
substrate/frame/balances/src/weights.rs
+1
View File
@@ -36,6 +36,7 @@
// --template=./.maintain/frame-weight-template.hbs
#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
#![allow(unused_imports)]