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

Apply some clippy lints (#11154)

Browse Source 
* Apply some clippy hints

* Revert clippy ci changes

* Update client/cli/src/commands/generate.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/cli/src/commands/inspect_key.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/db/src/bench.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/db/src/bench.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/service/src/client/block_rules.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/service/src/client/block_rules.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/network/src/transactions.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/network/src/protocol.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Revert due to missing `or_default` function.

* Fix compilation and simplify code

* Undo change that corrupts benchmark.

* fix clippy

* Update client/service/test/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/state-db/src/noncanonical.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/state-db/src/noncanonical.rs

remove leftovers!

* Update client/tracing/src/logging/directives.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update utils/fork-tree/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* added needed ref

* Update frame/referenda/src/benchmarking.rs

* Simplify byte-vec creation

* let's just not overlap the ranges

* Correction

* cargo fmt

* Update utils/frame/benchmarking-cli/src/shared/stats.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update utils/frame/benchmarking-cli/src/pallet/command.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update utils/frame/benchmarking-cli/src/pallet/command.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Giles Cope <gilescope@gmail.com>
This commit is contained in:
Falco Hirschenberger
2022-04-30 23:28:27 +02:00
committed by GitHub
parent a990473cf9
commit b581604aa7
368 changed files with 1927 additions and 2236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/society/src/lib.rs
+17 -19
View File
@@ -357,10 +357,10 @@ impl<AccountId: PartialEq, Balance> BidKind<AccountId, Balance> {
if a == v {
Ok(())
} else {
Err("incorrect identity")?
Err("incorrect identity".into())
}
} else {
Err("not vouched")?
Err("not vouched".into())
}
}
}
@@ -724,7 +724,7 @@ pub mod pallet {
let deposit = T::CandidateDeposit::get();
T::Currency::reserve(&who, deposit)?;
Self::put_bid(bids, &who, value.clone(), BidKind::Deposit(deposit));
Self::put_bid(bids, &who, value, BidKind::Deposit(deposit));
Self::deposit_event(Event::<T, I>::Bid { candidate_id: who, offer: value });
Ok(())
}
@@ -770,7 +770,7 @@ pub mod pallet {
Self::deposit_event(Event::<T, I>::Unbid { candidate: who });
Ok(())
} else {
Err(Error::<T, I>::BadPosition)?
Err(Error::<T, I>::BadPosition.into())
}
})
}
@@ -844,7 +844,7 @@ pub mod pallet {
ensure!(!<Vouching<T, I>>::contains_key(&voucher), Error::<T, I>::AlreadyVouching);
<Vouching<T, I>>::insert(&voucher, VouchingStatus::Vouching);
Self::put_bid(bids, &who, value.clone(), BidKind::Vouch(voucher.clone(), tip));
Self::put_bid(bids, &who, value, BidKind::Vouch(voucher.clone(), tip));
Self::deposit_event(Event::<T, I>::Vouch {
candidate_id: who,
offer: value,
@@ -887,7 +887,7 @@ pub mod pallet {
Self::deposit_event(Event::<T, I>::Unvouch { candidate: who });
Ok(())
} else {
Err(Error::<T, I>::BadPosition)?
Err(Error::<T, I>::BadPosition.into())
}
})
}
@@ -1001,7 +1001,7 @@ pub mod pallet {
return Ok(())
}
}
Err(Error::<T, I>::NoPayout)?
Err(Error::<T, I>::NoPayout.into())
}
/// Found the society.
@@ -1229,7 +1229,7 @@ pub mod pallet {
// Remove suspended candidate
<SuspendedCandidates<T, I>>::remove(who);
} else {
Err(Error::<T, I>::NotSuspended)?
return Err(Error::<T, I>::NotSuspended.into())
}
Ok(())
}
@@ -1392,8 +1392,8 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
ensure!(Self::founder() != Some(m.clone()), Error::<T, I>::Founder);
let mut members = <Members<T, I>>::get();
match members.binary_search(&m) {
Err(_) => Err(Error::<T, I>::NotMember)?,
match members.binary_search(m) {
Err(_) => Err(Error::<T, I>::NotMember.into()),
Ok(i) => {
members.remove(i);
T::MembershipChanged::change_members_sorted(&[], &[m.clone()], &members[..]);
@@ -1572,7 +1572,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
<Members<T, I>>::put(&members[..]);
<Head<T, I>>::put(&primary);
T::MembershipChanged::change_members_sorted(&accounts, &[], &members);
T::MembershipChanged::change_members_sorted(&accounts, &[], members);
Self::deposit_event(Event::<T, I>::Inducted { primary, candidates: accounts });
}
@@ -1605,7 +1605,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
if !payouts.is_empty() {
let mut dropped = 0;
for (_, amount) in payouts.iter_mut() {
if let Some(new_rest) = rest.checked_sub(&amount) {
if let Some(new_rest) = rest.checked_sub(amount) {
// not yet totally slashed after this one; drop it completely.
rest = new_rest;
dropped += 1;
@@ -1635,7 +1635,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
/// Suspend a user, removing them from the member list.
fn suspend_member(who: &T::AccountId) {
if Self::remove_member(&who).is_ok() {
if Self::remove_member(who).is_ok() {
<SuspendedMembers<T, I>>::insert(who, true);
<Strikes<T, I>>::remove(who);
Self::deposit_event(Event::<T, I>::MemberSuspended { member: who.clone() });
@@ -1683,12 +1683,10 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
let mut approval_count = 0;
let mut rejection_count = 0;
// Tallies total number of approve and reject votes for the defender.
members.iter().filter_map(|m| <DefenderVotes<T, I>>::take(m)).for_each(
|v| match v {
Vote::Approve => approval_count += 1,
_ => rejection_count += 1,
},
);
members.iter().filter_map(<DefenderVotes<T, I>>::take).for_each(|v| match v {
Vote::Approve => approval_count += 1,
_ => rejection_count += 1,
});
if approval_count <= rejection_count {
// User has failed the challenge