Apply some clippy lints (#11154)

* 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
@@ -57,10 +57,7 @@ fn create_referendum<T: Config>() -> (T::AccountId, ReferendumIndex) {
fn place_deposit<T: Config>(index: ReferendumIndex) {
let caller = funded_account::<T>("caller", 0);
whitelist_account!(caller);
assert_ok!(Referenda::<T>::place_decision_deposit(
RawOrigin::Signed(caller.clone()).into(),
index,
));
assert_ok!(Referenda::<T>::place_decision_deposit(RawOrigin::Signed(caller).into(), index));
}
fn nudge<T: Config>(index: ReferendumIndex) {
@@ -265,7 +262,7 @@ benchmarks! {
let track = Referenda::<T>::ensure_ongoing(index).unwrap().track;
assert_ok!(Referenda::<T>::cancel(T::CancelOrigin::successful_origin(), index));
assert_eq!(DecidingCount::<T>::get(&track), 1);
}: one_fewer_deciding(RawOrigin::Root, track.clone())
}: one_fewer_deciding(RawOrigin::Root, track)
verify {
assert_eq!(DecidingCount::<T>::get(&track), 0);
}
@@ -278,7 +275,7 @@ benchmarks! {
assert_ok!(Referenda::<T>::cancel(T::CancelOrigin::successful_origin(), queued[0]));
assert_eq!(TrackQueue::<T>::get(&track).len() as u32, T::MaxQueued::get());
let deciding_count = DecidingCount::<T>::get(&track);
}: one_fewer_deciding(RawOrigin::Root, track.clone())
}: one_fewer_deciding(RawOrigin::Root, track)
verify {
assert_eq!(DecidingCount::<T>::get(&track), deciding_count);
assert_eq!(TrackQueue::<T>::get(&track).len() as u32, T::MaxQueued::get() - 1);
@@ -297,7 +294,7 @@ benchmarks! {
assert_ok!(Referenda::<T>::cancel(T::CancelOrigin::successful_origin(), queued[0]));
assert_eq!(TrackQueue::<T>::get(&track).len() as u32, T::MaxQueued::get());
let deciding_count = DecidingCount::<T>::get(&track);
}: one_fewer_deciding(RawOrigin::Root, track.clone())
}: one_fewer_deciding(RawOrigin::Root, track)
verify {
assert_eq!(DecidingCount::<T>::get(&track), deciding_count);
assert_eq!(TrackQueue::<T>::get(&track).len() as u32, T::MaxQueued::get() - 1);
+7 -7
View File
@@ -363,7 +363,7 @@ pub mod pallet {
let status = ReferendumStatus {
track,
origin: proposal_origin,
proposal_hash: proposal_hash.clone(),
proposal_hash,
enactment: enactment_moment,
submitted: now,
submission_deposit,
@@ -643,7 +643,7 @@ impl<T: Config<I>, I: 'static> Polling<T::Tally> for Pallet<T, I> {
.iter()
.max_by_key(|(_, info)| info.max_deciding)
.expect("Always one class");
(r.0.clone(), r.1.max_deciding)
(r.0, r.1.max_deciding)
}
}
@@ -730,8 +730,8 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
Self::deposit_event(Event::<T, I>::DecisionStarted {
index,
tally: status.tally.clone(),
proposal_hash: status.proposal_hash.clone(),
track: status.track.clone(),
proposal_hash: status.proposal_hash,
track: status.track,
});
let confirming = if is_passing {
Self::deposit_event(Event::<T, I>::ConfirmStarted { index });
@@ -895,7 +895,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
let prepare_end = status.submitted.saturating_add(track.prepare_period);
if now >= prepare_end {
let (maybe_alarm, branch) =
Self::ready_for_deciding(now, &track, index, &mut status);
Self::ready_for_deciding(now, track, index, &mut status);
if let Some(set_alarm) = maybe_alarm {
alarm = alarm.min(set_alarm);
}
@@ -934,7 +934,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
&track.min_approval,
);
branch = if is_passing {
match deciding.confirming.clone() {
match deciding.confirming {
Some(t) if now >= t => {
// Passed!
Self::ensure_no_alarm(&mut status);
@@ -996,7 +996,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
ServiceBranch::ContinueNotConfirming
}
};
alarm = Self::decision_time(&deciding, &status.tally, track);
alarm = Self::decision_time(deciding, &status.tally, track);
},
}
+3 -3
View File
@@ -182,7 +182,7 @@ pub trait TracksInfo<Balance, Moment> {
/// Return the track info for track `id`, by default this just looks it up in `Self::tracks()`.
fn info(id: Self::Id) -> Option<&'static TrackInfo<Balance, Moment>> {
Self::tracks().iter().find(|x| &x.0 == &id).map(|x| &x.1)
Self::tracks().iter().find(|x| x.0 == id).map(|x| &x.1)
}
}
@@ -309,9 +309,9 @@ impl Curve {
match self {
Self::LinearDecreasing { begin, delta } =>
if delta.is_zero() {
return *delta
*delta
} else {
return (*begin - y.min(*begin)).min(*delta) / *delta
(*begin - y.min(*begin)).min(*delta) / *delta
},
}
}