Fix clippy warnings (#7625)

* Fix clippy check

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Autofix clippy

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Fix trivial

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* fmt

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* suppress warnings

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Quiet clippy 😌

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
This commit is contained in:
Oliver Tale-Yazdi
2023-08-16 14:20:31 +02:00
committed by GitHub
parent a0f83eb992
commit d501d92176
51 changed files with 729 additions and 1073 deletions
@@ -136,16 +136,16 @@ fn partitioning_happy_case() {
CandidateHash(Hash::random()),
DisputeStatus::ConcludedFor(time_now - ACTIVE_DURATION_SECS * 2),
);
input.push(inactive_unknown_onchain.clone());
input.push(inactive_unknown_onchain);
let inactive_unconcluded_onchain = (
1,
CandidateHash(Hash::random()),
DisputeStatus::ConcludedFor(time_now - ACTIVE_DURATION_SECS * 2),
);
input.push(inactive_unconcluded_onchain.clone());
input.push(inactive_unconcluded_onchain);
onchain.insert(
(inactive_unconcluded_onchain.0, inactive_unconcluded_onchain.1.clone()),
(inactive_unconcluded_onchain.0, inactive_unconcluded_onchain.1),
DisputeState {
validators_for: bitvec![u8, Lsb0; 1, 1, 1, 0, 0, 0, 0, 0, 0],
validators_against: bitvec![u8, Lsb0; 0, 0, 0, 0, 0, 0, 0, 0, 0],
@@ -155,12 +155,12 @@ fn partitioning_happy_case() {
);
let active_unknown_onchain = (2, CandidateHash(Hash::random()), DisputeStatus::Active);
input.push(active_unknown_onchain.clone());
input.push(active_unknown_onchain);
let active_unconcluded_onchain = (3, CandidateHash(Hash::random()), DisputeStatus::Active);
input.push(active_unconcluded_onchain.clone());
input.push(active_unconcluded_onchain);
onchain.insert(
(active_unconcluded_onchain.0, active_unconcluded_onchain.1.clone()),
(active_unconcluded_onchain.0, active_unconcluded_onchain.1),
DisputeState {
validators_for: bitvec![u8, Lsb0; 1, 1, 1, 0, 0, 0, 0, 0, 0],
validators_against: bitvec![u8, Lsb0; 0, 0, 0, 0, 0, 0, 0, 0, 0],
@@ -170,9 +170,9 @@ fn partitioning_happy_case() {
);
let active_concluded_onchain = (4, CandidateHash(Hash::random()), DisputeStatus::Active);
input.push(active_concluded_onchain.clone());
input.push(active_concluded_onchain);
onchain.insert(
(active_concluded_onchain.0, active_concluded_onchain.1.clone()),
(active_concluded_onchain.0, active_concluded_onchain.1),
DisputeState {
validators_for: bitvec![u8, Lsb0; 1, 1, 1, 1, 1, 1, 1, 1, 0],
validators_against: bitvec![u8, Lsb0; 0, 0, 0, 0, 0, 0, 0, 0, 0],
@@ -186,9 +186,9 @@ fn partitioning_happy_case() {
CandidateHash(Hash::random()),
DisputeStatus::ConcludedFor(time_now - ACTIVE_DURATION_SECS * 2),
);
input.push(inactive_concluded_onchain.clone());
input.push(inactive_concluded_onchain);
onchain.insert(
(inactive_concluded_onchain.0, inactive_concluded_onchain.1.clone()),
(inactive_concluded_onchain.0, inactive_concluded_onchain.1),
DisputeState {
validators_for: bitvec![u8, Lsb0; 1, 1, 1, 1, 1, 1, 1, 0, 0],
validators_against: bitvec![u8, Lsb0; 0, 0, 0, 0, 0, 0, 0, 0, 0],
@@ -254,10 +254,10 @@ fn partitioning_doubled_onchain_vote() {
// Dispute B has supermajority + 1 votes, so the doubled onchain vote doesn't affect it. It
// should be considered as 'can conclude onchain'.
let dispute_b = (4, CandidateHash(Hash::random()), DisputeStatus::Active);
input.push(dispute_a.clone());
input.push(dispute_b.clone());
input.push(dispute_a);
input.push(dispute_b);
onchain.insert(
(dispute_a.0, dispute_a.1.clone()),
(dispute_a.0, dispute_a.1),
DisputeState {
validators_for: bitvec![u8, Lsb0; 1, 1, 1, 1, 1, 1, 1, 0, 0],
validators_against: bitvec![u8, Lsb0; 1, 0, 0, 0, 0, 0, 0, 0, 0],
@@ -266,7 +266,7 @@ fn partitioning_doubled_onchain_vote() {
},
);
onchain.insert(
(dispute_b.0, dispute_b.1.clone()),
(dispute_b.0, dispute_b.1),
DisputeState {
validators_for: bitvec![u8, Lsb0; 1, 1, 1, 1, 1, 1, 1, 1, 0],
validators_against: bitvec![u8, Lsb0; 1, 0, 0, 0, 0, 0, 0, 0, 0],
@@ -287,10 +287,10 @@ fn partitioning_duplicated_dispute() {
let mut onchain = HashMap::<(u32, CandidateHash), DisputeState>::new();
let some_dispute = (3, CandidateHash(Hash::random()), DisputeStatus::Active);
input.push(some_dispute.clone());
input.push(some_dispute.clone());
input.push(some_dispute);
input.push(some_dispute);
onchain.insert(
(some_dispute.0, some_dispute.1.clone()),
(some_dispute.0, some_dispute.1),
DisputeState {
validators_for: bitvec![u8, Lsb0; 1, 1, 1, 0, 0, 0, 0, 0, 0],
validators_against: bitvec![u8, Lsb0; 0, 0, 0, 0, 0, 0, 0, 0, 0],
@@ -385,7 +385,7 @@ impl TestDisputes {
local_votes_count: usize,
dummy_receipt: CandidateReceipt,
) {
self.local_disputes.push(dispute.clone());
self.local_disputes.push(dispute);
self.votes_db.insert(
(dispute.0, dispute.1),
CandidateVotes {
@@ -412,7 +412,7 @@ impl TestDisputes {
DisputeStatus::ConcludedAgainst(_) | DisputeStatus::ConcludedFor(_) => Some(1),
};
self.onchain_disputes.insert(
(dispute.0, dispute.1.clone()),
(dispute.0, dispute.1),
DisputeState {
validators_for: TestDisputes::generate_bitvec(
self.validators_count,
@@ -434,10 +434,10 @@ impl TestDisputes {
let onchain_votes_count = self.validators_count * 80 / 100;
let session_idx = 0;
let lf = leaf();
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash.clone());
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash);
for _ in 0..dispute_count {
let d = (session_idx, CandidateHash(Hash::random()), DisputeStatus::Active);
self.add_offchain_dispute(d.clone(), local_votes_count, dummy_receipt.clone());
self.add_offchain_dispute(d, local_votes_count, dummy_receipt.clone());
self.add_onchain_dispute(d, onchain_votes_count);
}
@@ -452,10 +452,10 @@ impl TestDisputes {
let onchain_votes_count = self.validators_count * 40 / 100;
let session_idx = 1;
let lf = leaf();
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash.clone());
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash);
for _ in 0..dispute_count {
let d = (session_idx, CandidateHash(Hash::random()), DisputeStatus::Active);
self.add_offchain_dispute(d.clone(), local_votes_count, dummy_receipt.clone());
self.add_offchain_dispute(d, local_votes_count, dummy_receipt.clone());
self.add_onchain_dispute(d, onchain_votes_count);
}
@@ -469,10 +469,10 @@ impl TestDisputes {
let local_votes_count = self.validators_count * 90 / 100;
let session_idx = 2;
let lf = leaf();
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash.clone());
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash);
for _ in 0..dispute_count {
let d = (session_idx, CandidateHash(Hash::random()), DisputeStatus::Confirmed);
self.add_offchain_dispute(d.clone(), local_votes_count, dummy_receipt.clone());
self.add_offchain_dispute(d, local_votes_count, dummy_receipt.clone());
}
(session_idx, local_votes_count * dispute_count)
}
@@ -485,10 +485,10 @@ impl TestDisputes {
let onchain_votes_count = self.validators_count * 75 / 100;
let session_idx = 3;
let lf = leaf();
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash.clone());
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash);
for _ in 0..dispute_count {
let d = (session_idx, CandidateHash(Hash::random()), DisputeStatus::ConcludedFor(0));
self.add_offchain_dispute(d.clone(), local_votes_count, dummy_receipt.clone());
self.add_offchain_dispute(d, local_votes_count, dummy_receipt.clone());
self.add_onchain_dispute(d, onchain_votes_count);
}
(session_idx, (local_votes_count - onchain_votes_count) * dispute_count)
@@ -501,10 +501,10 @@ impl TestDisputes {
let local_votes_count = self.validators_count * 90 / 100;
let session_idx = 4;
let lf = leaf();
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash.clone());
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash);
for _ in 0..dispute_count {
let d = (session_idx, CandidateHash(Hash::random()), DisputeStatus::ConcludedFor(0));
self.add_offchain_dispute(d.clone(), local_votes_count, dummy_receipt.clone());
self.add_offchain_dispute(d, local_votes_count, dummy_receipt.clone());
}
(session_idx, local_votes_count * dispute_count)
}
@@ -517,10 +517,10 @@ impl TestDisputes {
let onchain_votes_count = self.validators_count * 10 / 100;
let session_idx = 5;
let lf = leaf();
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash.clone());
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash);
for _ in 0..dispute_count {
let d = (session_idx, CandidateHash(Hash::random()), DisputeStatus::Active);
self.add_offchain_dispute(d.clone(), local_votes_count, dummy_receipt.clone());
self.add_offchain_dispute(d, local_votes_count, dummy_receipt.clone());
self.add_onchain_dispute(d, onchain_votes_count);
}
@@ -534,10 +534,10 @@ impl TestDisputes {
let local_votes_count = self.validators_count * 10 / 100;
let session_idx = 6;
let lf = leaf();
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash.clone());
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash);
for _ in 0..dispute_count {
let d = (session_idx, CandidateHash(Hash::random()), DisputeStatus::Active);
self.add_offchain_dispute(d.clone(), local_votes_count, dummy_receipt.clone());
self.add_offchain_dispute(d, local_votes_count, dummy_receipt.clone());
}
(session_idx, local_votes_count * dispute_count)