mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-12 21:41:12 +00:00
Fix Clippy (#2522)
* Import Clippy config from Polkadot Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Auto clippy fix Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * No tabs in comments Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Prefer matches Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Dont drop references Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Trivial Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Refactor Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * fmt Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * add clippy to ci * Clippy reborrow Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Update client/pov-recovery/src/lib.rs Co-authored-by: Bastian Köcher <git@kchr.de> * Update client/pov-recovery/src/lib.rs Co-authored-by: Bastian Köcher <git@kchr.de> * Partially revert 'Prefer matches' Using matches! instead of match does give less compiler checks as per review from @chevdor. Partially reverts 8c0609677f3ea040f77fffd5be6facf7c3fec95c Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Update .cargo/config.toml Co-authored-by: Chevdor <chevdor@users.noreply.github.com> * Revert revert 💩 Should be fine to use matches! macro since it is an explicit whitelist, not wildcard matching. --------- Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Co-authored-by: alvicsam <alvicsam@gmail.com> Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: Chevdor <chevdor@users.noreply.github.com> Co-authored-by: parity-processbot <>
This commit is contained in:
Oliver Tale-Yazdi
committed by
GitHub
GitHub
parent
4dc50c8d89
commit
c312f0b9a6
@@ -129,7 +129,7 @@ benchmarks! {
|
||||
T::UpdateOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
|
||||
}: {
|
||||
assert_ok!(
|
||||
<CollatorSelection<T>>::set_desired_candidates(origin, max.clone())
|
||||
<CollatorSelection<T>>::set_desired_candidates(origin, max)
|
||||
);
|
||||
}
|
||||
verify {
|
||||
@@ -142,7 +142,7 @@ benchmarks! {
|
||||
T::UpdateOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
|
||||
}: {
|
||||
assert_ok!(
|
||||
<CollatorSelection<T>>::set_candidacy_bond(origin, bond_amount.clone())
|
||||
<CollatorSelection<T>>::set_candidacy_bond(origin, bond_amount)
|
||||
);
|
||||
}
|
||||
verify {
|
||||
@@ -162,7 +162,7 @@ benchmarks! {
|
||||
|
||||
let caller: T::AccountId = whitelisted_caller();
|
||||
let bond: BalanceOf<T> = T::Currency::minimum_balance() * 2u32.into();
|
||||
T::Currency::make_free_balance_be(&caller, bond.clone());
|
||||
T::Currency::make_free_balance_be(&caller, bond);
|
||||
|
||||
<session::Pallet<T>>::set_keys(
|
||||
RawOrigin::Signed(caller.clone()).into(),
|
||||
|
||||
@@ -238,8 +238,8 @@ pub mod pallet {
|
||||
"genesis desired_candidates are more than T::MaxCandidates",
|
||||
);
|
||||
|
||||
<DesiredCandidates<T>>::put(&self.desired_candidates);
|
||||
<CandidacyBond<T>>::put(&self.candidacy_bond);
|
||||
<DesiredCandidates<T>>::put(self.desired_candidates);
|
||||
<CandidacyBond<T>>::put(self.candidacy_bond);
|
||||
<Invulnerables<T>>::put(bounded_invulnerables);
|
||||
}
|
||||
}
|
||||
@@ -326,7 +326,7 @@ pub mod pallet {
|
||||
if max > T::MaxCandidates::get() {
|
||||
log::warn!("max > T::MaxCandidates; you might need to run benchmarks again");
|
||||
}
|
||||
<DesiredCandidates<T>>::put(&max);
|
||||
<DesiredCandidates<T>>::put(max);
|
||||
Self::deposit_event(Event::NewDesiredCandidates { desired_candidates: max });
|
||||
Ok(().into())
|
||||
}
|
||||
@@ -339,7 +339,7 @@ pub mod pallet {
|
||||
bond: BalanceOf<T>,
|
||||
) -> DispatchResultWithPostInfo {
|
||||
T::UpdateOrigin::ensure_origin(origin)?;
|
||||
<CandidacyBond<T>>::put(&bond);
|
||||
<CandidacyBond<T>>::put(bond);
|
||||
Self::deposit_event(Event::NewCandidacyBond { bond_amount: bond });
|
||||
Ok(().into())
|
||||
}
|
||||
|
||||
@@ -152,12 +152,12 @@ pub struct TestSessionHandler;
|
||||
impl pallet_session::SessionHandler<u64> for TestSessionHandler {
|
||||
const KEY_TYPE_IDS: &'static [sp_runtime::KeyTypeId] = &[UintAuthorityId::ID];
|
||||
fn on_genesis_session<Ks: OpaqueKeys>(keys: &[(u64, Ks)]) {
|
||||
SessionHandlerCollators::set(keys.into_iter().map(|(a, _)| *a).collect::<Vec<_>>())
|
||||
SessionHandlerCollators::set(keys.iter().map(|(a, _)| *a).collect::<Vec<_>>())
|
||||
}
|
||||
fn on_new_session<Ks: OpaqueKeys>(_: bool, keys: &[(u64, Ks)], _: &[(u64, Ks)]) {
|
||||
SessionChangeBlock::set(System::block_number());
|
||||
dbg!(keys.len());
|
||||
SessionHandlerCollators::set(keys.into_iter().map(|(a, _)| *a).collect::<Vec<_>>())
|
||||
SessionHandlerCollators::set(keys.iter().map(|(a, _)| *a).collect::<Vec<_>>())
|
||||
}
|
||||
fn on_before_session_ending() {}
|
||||
fn on_disabled(_: u32) {}
|
||||
@@ -195,11 +195,7 @@ parameter_types! {
|
||||
pub struct IsRegistered;
|
||||
impl ValidatorRegistration<u64> for IsRegistered {
|
||||
fn is_registered(id: &u64) -> bool {
|
||||
if *id == 7u64 {
|
||||
false
|
||||
} else {
|
||||
true
|
||||
}
|
||||
*id != 7u64
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ fn it_should_set_invulnerables() {
|
||||
|
||||
// cannot set with non-root.
|
||||
assert_noop!(
|
||||
CollatorSelection::set_invulnerables(RuntimeOrigin::signed(1), new_set.clone()),
|
||||
CollatorSelection::set_invulnerables(RuntimeOrigin::signed(1), new_set),
|
||||
BadOrigin
|
||||
);
|
||||
|
||||
@@ -54,7 +54,7 @@ fn it_should_set_invulnerables() {
|
||||
assert_noop!(
|
||||
CollatorSelection::set_invulnerables(
|
||||
RuntimeOrigin::signed(RootAccount::get()),
|
||||
invulnerables.clone()
|
||||
invulnerables
|
||||
),
|
||||
Error::<Test>::ValidatorNotRegistered
|
||||
);
|
||||
@@ -184,8 +184,8 @@ fn cannot_register_dupe_candidate() {
|
||||
#[test]
|
||||
fn cannot_register_as_candidate_if_poor() {
|
||||
new_test_ext().execute_with(|| {
|
||||
assert_eq!(Balances::free_balance(&3), 100);
|
||||
assert_eq!(Balances::free_balance(&33), 0);
|
||||
assert_eq!(Balances::free_balance(3), 100);
|
||||
assert_eq!(Balances::free_balance(33), 0);
|
||||
|
||||
// works
|
||||
assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
|
||||
@@ -208,14 +208,14 @@ fn register_as_candidate_works() {
|
||||
assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);
|
||||
|
||||
// take two endowed, non-invulnerables accounts.
|
||||
assert_eq!(Balances::free_balance(&3), 100);
|
||||
assert_eq!(Balances::free_balance(&4), 100);
|
||||
assert_eq!(Balances::free_balance(3), 100);
|
||||
assert_eq!(Balances::free_balance(4), 100);
|
||||
|
||||
assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
|
||||
assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
|
||||
|
||||
assert_eq!(Balances::free_balance(&3), 90);
|
||||
assert_eq!(Balances::free_balance(&4), 90);
|
||||
assert_eq!(Balances::free_balance(3), 90);
|
||||
assert_eq!(Balances::free_balance(4), 90);
|
||||
|
||||
assert_eq!(CollatorSelection::candidates().len(), 2);
|
||||
});
|
||||
|
||||
@@ -39,93 +39,91 @@ pub trait WeightInfo {
|
||||
pub struct SubstrateWeight<T>(PhantomData<T>);
|
||||
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
|
||||
fn set_invulnerables(b: u32) -> Weight {
|
||||
Weight::from_parts(18_563_000 as u64, 0)
|
||||
Weight::from_parts(18_563_000_u64, 0)
|
||||
// Standard Error: 0
|
||||
.saturating_add(Weight::from_parts(68_000 as u64, 0).saturating_mul(b as u64))
|
||||
.saturating_add(T::DbWeight::get().writes(1 as u64))
|
||||
.saturating_add(Weight::from_parts(68_000_u64, 0).saturating_mul(b as u64))
|
||||
.saturating_add(T::DbWeight::get().writes(1_u64))
|
||||
}
|
||||
fn set_desired_candidates() -> Weight {
|
||||
Weight::from_parts(16_363_000 as u64, 0).saturating_add(T::DbWeight::get().writes(1 as u64))
|
||||
Weight::from_parts(16_363_000_u64, 0).saturating_add(T::DbWeight::get().writes(1_u64))
|
||||
}
|
||||
fn set_candidacy_bond() -> Weight {
|
||||
Weight::from_parts(16_840_000 as u64, 0).saturating_add(T::DbWeight::get().writes(1 as u64))
|
||||
Weight::from_parts(16_840_000_u64, 0).saturating_add(T::DbWeight::get().writes(1_u64))
|
||||
}
|
||||
fn register_as_candidate(c: u32) -> Weight {
|
||||
Weight::from_parts(71_196_000 as u64, 0)
|
||||
Weight::from_parts(71_196_000_u64, 0)
|
||||
// Standard Error: 0
|
||||
.saturating_add(Weight::from_parts(198_000 as u64, 0).saturating_mul(c as u64))
|
||||
.saturating_add(T::DbWeight::get().reads(4 as u64))
|
||||
.saturating_add(T::DbWeight::get().writes(2 as u64))
|
||||
.saturating_add(Weight::from_parts(198_000_u64, 0).saturating_mul(c as u64))
|
||||
.saturating_add(T::DbWeight::get().reads(4_u64))
|
||||
.saturating_add(T::DbWeight::get().writes(2_u64))
|
||||
}
|
||||
fn leave_intent(c: u32) -> Weight {
|
||||
Weight::from_parts(55_336_000 as u64, 0)
|
||||
Weight::from_parts(55_336_000_u64, 0)
|
||||
// Standard Error: 0
|
||||
.saturating_add(Weight::from_parts(151_000 as u64, 0).saturating_mul(c as u64))
|
||||
.saturating_add(T::DbWeight::get().reads(1 as u64))
|
||||
.saturating_add(T::DbWeight::get().writes(2 as u64))
|
||||
.saturating_add(Weight::from_parts(151_000_u64, 0).saturating_mul(c as u64))
|
||||
.saturating_add(T::DbWeight::get().reads(1_u64))
|
||||
.saturating_add(T::DbWeight::get().writes(2_u64))
|
||||
}
|
||||
fn note_author() -> Weight {
|
||||
Weight::from_parts(71_461_000 as u64, 0)
|
||||
.saturating_add(T::DbWeight::get().reads(3 as u64))
|
||||
.saturating_add(T::DbWeight::get().writes(4 as u64))
|
||||
Weight::from_parts(71_461_000_u64, 0)
|
||||
.saturating_add(T::DbWeight::get().reads(3_u64))
|
||||
.saturating_add(T::DbWeight::get().writes(4_u64))
|
||||
}
|
||||
fn new_session(r: u32, c: u32) -> Weight {
|
||||
Weight::from_parts(0 as u64, 0)
|
||||
Weight::from_parts(0_u64, 0)
|
||||
// Standard Error: 1_010_000
|
||||
.saturating_add(Weight::from_parts(109_961_000 as u64, 0).saturating_mul(r as u64))
|
||||
.saturating_add(Weight::from_parts(109_961_000_u64, 0).saturating_mul(r as u64))
|
||||
// Standard Error: 1_010_000
|
||||
.saturating_add(Weight::from_parts(151_952_000 as u64, 0).saturating_mul(c as u64))
|
||||
.saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64)))
|
||||
.saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(c as u64)))
|
||||
.saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(r as u64)))
|
||||
.saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(c as u64)))
|
||||
.saturating_add(Weight::from_parts(151_952_000_u64, 0).saturating_mul(c as u64))
|
||||
.saturating_add(T::DbWeight::get().reads(1_u64.saturating_mul(r as u64)))
|
||||
.saturating_add(T::DbWeight::get().reads(2_u64.saturating_mul(c as u64)))
|
||||
.saturating_add(T::DbWeight::get().writes(2_u64.saturating_mul(r as u64)))
|
||||
.saturating_add(T::DbWeight::get().writes(2_u64.saturating_mul(c as u64)))
|
||||
}
|
||||
}
|
||||
|
||||
// For backwards compatibility and tests
|
||||
impl WeightInfo for () {
|
||||
fn set_invulnerables(b: u32) -> Weight {
|
||||
Weight::from_parts(18_563_000 as u64, 0)
|
||||
Weight::from_parts(18_563_000_u64, 0)
|
||||
// Standard Error: 0
|
||||
.saturating_add(Weight::from_parts(68_000 as u64, 0).saturating_mul(b as u64))
|
||||
.saturating_add(RocksDbWeight::get().writes(1 as u64))
|
||||
.saturating_add(Weight::from_parts(68_000_u64, 0).saturating_mul(b as u64))
|
||||
.saturating_add(RocksDbWeight::get().writes(1_u64))
|
||||
}
|
||||
fn set_desired_candidates() -> Weight {
|
||||
Weight::from_parts(16_363_000 as u64, 0)
|
||||
.saturating_add(RocksDbWeight::get().writes(1 as u64))
|
||||
Weight::from_parts(16_363_000_u64, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
|
||||
}
|
||||
fn set_candidacy_bond() -> Weight {
|
||||
Weight::from_parts(16_840_000 as u64, 0)
|
||||
.saturating_add(RocksDbWeight::get().writes(1 as u64))
|
||||
Weight::from_parts(16_840_000_u64, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
|
||||
}
|
||||
fn register_as_candidate(c: u32) -> Weight {
|
||||
Weight::from_parts(71_196_000 as u64, 0)
|
||||
Weight::from_parts(71_196_000_u64, 0)
|
||||
// Standard Error: 0
|
||||
.saturating_add(Weight::from_parts(198_000 as u64, 0).saturating_mul(c as u64))
|
||||
.saturating_add(RocksDbWeight::get().reads(4 as u64))
|
||||
.saturating_add(RocksDbWeight::get().writes(2 as u64))
|
||||
.saturating_add(Weight::from_parts(198_000_u64, 0).saturating_mul(c as u64))
|
||||
.saturating_add(RocksDbWeight::get().reads(4_u64))
|
||||
.saturating_add(RocksDbWeight::get().writes(2_u64))
|
||||
}
|
||||
fn leave_intent(c: u32) -> Weight {
|
||||
Weight::from_parts(55_336_000 as u64, 0)
|
||||
Weight::from_parts(55_336_000_u64, 0)
|
||||
// Standard Error: 0
|
||||
.saturating_add(Weight::from_parts(151_000 as u64, 0).saturating_mul(c as u64))
|
||||
.saturating_add(RocksDbWeight::get().reads(1 as u64))
|
||||
.saturating_add(RocksDbWeight::get().writes(2 as u64))
|
||||
.saturating_add(Weight::from_parts(151_000_u64, 0).saturating_mul(c as u64))
|
||||
.saturating_add(RocksDbWeight::get().reads(1_u64))
|
||||
.saturating_add(RocksDbWeight::get().writes(2_u64))
|
||||
}
|
||||
fn note_author() -> Weight {
|
||||
Weight::from_parts(71_461_000 as u64, 0)
|
||||
.saturating_add(RocksDbWeight::get().reads(3 as u64))
|
||||
.saturating_add(RocksDbWeight::get().writes(4 as u64))
|
||||
Weight::from_parts(71_461_000_u64, 0)
|
||||
.saturating_add(RocksDbWeight::get().reads(3_u64))
|
||||
.saturating_add(RocksDbWeight::get().writes(4_u64))
|
||||
}
|
||||
fn new_session(r: u32, c: u32) -> Weight {
|
||||
Weight::from_parts(0 as u64, 0)
|
||||
Weight::from_parts(0_u64, 0)
|
||||
// Standard Error: 1_010_000
|
||||
.saturating_add(Weight::from_parts(109_961_000 as u64, 0).saturating_mul(r as u64))
|
||||
.saturating_add(Weight::from_parts(109_961_000_u64, 0).saturating_mul(r as u64))
|
||||
// Standard Error: 1_010_000
|
||||
.saturating_add(Weight::from_parts(151_952_000 as u64, 0).saturating_mul(c as u64))
|
||||
.saturating_add(RocksDbWeight::get().reads((1 as u64).saturating_mul(r as u64)))
|
||||
.saturating_add(RocksDbWeight::get().reads((2 as u64).saturating_mul(c as u64)))
|
||||
.saturating_add(RocksDbWeight::get().writes((2 as u64).saturating_mul(r as u64)))
|
||||
.saturating_add(RocksDbWeight::get().writes((2 as u64).saturating_mul(c as u64)))
|
||||
.saturating_add(Weight::from_parts(151_952_000_u64, 0).saturating_mul(c as u64))
|
||||
.saturating_add(RocksDbWeight::get().reads(1_u64.saturating_mul(r as u64)))
|
||||
.saturating_add(RocksDbWeight::get().reads(2_u64.saturating_mul(c as u64)))
|
||||
.saturating_add(RocksDbWeight::get().writes(2_u64.saturating_mul(r as u64)))
|
||||
.saturating_add(RocksDbWeight::get().writes(2_u64.saturating_mul(c as u64)))
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user