mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-31 12:11:02 +00:00
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
committed by
GitHub
GitHub
parent
a0f83eb992
commit
d501d92176
@@ -377,7 +377,6 @@ fn test_initializer_on_new_session() {
|
||||
let mock_genesis_config = MockGenesisConfig {
|
||||
configuration: crate::configuration::GenesisConfig {
|
||||
config: HostConfiguration { dispute_period, ..Default::default() },
|
||||
..Default::default()
|
||||
},
|
||||
..Default::default()
|
||||
};
|
||||
@@ -386,13 +385,13 @@ fn test_initializer_on_new_session() {
|
||||
let v0 = <ValidatorId as CryptoType>::Pair::generate().0;
|
||||
|
||||
let candidate_hash = CandidateHash(sp_core::H256::repeat_byte(1));
|
||||
Pallet::<Test>::note_included(0, candidate_hash.clone(), 0);
|
||||
Pallet::<Test>::note_included(1, candidate_hash.clone(), 1);
|
||||
Pallet::<Test>::note_included(2, candidate_hash.clone(), 2);
|
||||
Pallet::<Test>::note_included(3, candidate_hash.clone(), 3);
|
||||
Pallet::<Test>::note_included(4, candidate_hash.clone(), 4);
|
||||
Pallet::<Test>::note_included(5, candidate_hash.clone(), 5);
|
||||
Pallet::<Test>::note_included(6, candidate_hash.clone(), 5);
|
||||
Pallet::<Test>::note_included(0, candidate_hash, 0);
|
||||
Pallet::<Test>::note_included(1, candidate_hash, 1);
|
||||
Pallet::<Test>::note_included(2, candidate_hash, 2);
|
||||
Pallet::<Test>::note_included(3, candidate_hash, 3);
|
||||
Pallet::<Test>::note_included(4, candidate_hash, 4);
|
||||
Pallet::<Test>::note_included(5, candidate_hash, 5);
|
||||
Pallet::<Test>::note_included(6, candidate_hash, 5);
|
||||
|
||||
run_to_block(7, |b| {
|
||||
// a new session at each block
|
||||
@@ -465,7 +464,7 @@ fn test_provide_multi_dispute_is_providing() {
|
||||
let inclusion_parent = sp_core::H256::repeat_byte(0xff);
|
||||
let session = 1;
|
||||
let stmts = vec![DisputeStatementSet {
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
session,
|
||||
statements: vec![
|
||||
(
|
||||
@@ -481,12 +480,8 @@ fn test_provide_multi_dispute_is_providing() {
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(1),
|
||||
v1.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -499,7 +494,7 @@ fn test_provide_multi_dispute_is_providing() {
|
||||
.map(CheckedDisputeStatementSet::unchecked_from_unchecked)
|
||||
.collect()
|
||||
),
|
||||
vec![(1, candidate_hash.clone())],
|
||||
vec![(1, candidate_hash)],
|
||||
);
|
||||
})
|
||||
}
|
||||
@@ -528,31 +523,23 @@ fn test_disputes_with_missing_backing_votes_are_rejected() {
|
||||
let session = 1;
|
||||
|
||||
let stmts = vec![DisputeStatementSet {
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
session,
|
||||
statements: vec![
|
||||
(
|
||||
DisputeStatement::Valid(ValidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(0),
|
||||
v0.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: true,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: true, candidate_hash, session }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(1),
|
||||
v1.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -590,31 +577,23 @@ fn test_freeze_on_note_included() {
|
||||
|
||||
// v0 votes for 3
|
||||
let stmts = vec![DisputeStatementSet {
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
session: 3,
|
||||
statements: vec![
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(0),
|
||||
v0.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session: 3,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session: 3 }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(1),
|
||||
v1.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session: 3,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session: 3 }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
@@ -636,7 +615,7 @@ fn test_freeze_on_note_included() {
|
||||
)
|
||||
.is_ok());
|
||||
|
||||
Pallet::<Test>::note_included(3, candidate_hash.clone(), 3);
|
||||
Pallet::<Test>::note_included(3, candidate_hash, 3);
|
||||
assert_eq!(Frozen::<Test>::get(), Some(2));
|
||||
});
|
||||
}
|
||||
@@ -663,31 +642,23 @@ fn test_freeze_provided_against_supermajority_for_included() {
|
||||
|
||||
// v0 votes for 3
|
||||
let stmts = vec![DisputeStatementSet {
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
session,
|
||||
statements: vec![
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(0),
|
||||
v0.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(1),
|
||||
v1.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
@@ -702,7 +673,7 @@ fn test_freeze_provided_against_supermajority_for_included() {
|
||||
],
|
||||
}];
|
||||
|
||||
Pallet::<Test>::note_included(3, candidate_hash.clone(), 3);
|
||||
Pallet::<Test>::note_included(3, candidate_hash, 3);
|
||||
assert!(Pallet::<Test>::process_checked_multi_dispute_data(
|
||||
&stmts
|
||||
.into_iter()
|
||||
@@ -744,43 +715,31 @@ fn test_freeze_provided_against_byzantine_threshold_for_included() {
|
||||
|
||||
// A byzantine threshold of INVALID
|
||||
let stmts = vec![DisputeStatementSet {
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
session,
|
||||
statements: vec![
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(0),
|
||||
v0.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(1),
|
||||
v1.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(2),
|
||||
v2.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
@@ -796,7 +755,7 @@ fn test_freeze_provided_against_byzantine_threshold_for_included() {
|
||||
}];
|
||||
|
||||
// Include the candidate and import the votes
|
||||
Pallet::<Test>::note_included(3, candidate_hash.clone(), 3);
|
||||
Pallet::<Test>::note_included(3, candidate_hash, 3);
|
||||
assert!(Pallet::<Test>::process_checked_multi_dispute_data(
|
||||
&stmts
|
||||
.into_iter()
|
||||
@@ -813,43 +772,31 @@ fn test_freeze_provided_against_byzantine_threshold_for_included() {
|
||||
|
||||
// And generate enough votes to reach supermajority of invalid votes
|
||||
let stmts = vec![DisputeStatementSet {
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
session,
|
||||
statements: vec![
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(3),
|
||||
v3.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(4),
|
||||
v4.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(5),
|
||||
v5.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -922,31 +869,23 @@ mod unconfirmed_disputes {
|
||||
|
||||
// v0 votes for 4, v1 votes against 4.
|
||||
DisputeStatementSet {
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
session: 4,
|
||||
statements: vec![
|
||||
(
|
||||
DisputeStatement::Valid(ValidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(0),
|
||||
v0.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: true,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session: 4,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: true, candidate_hash, session: 4 }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(3),
|
||||
v1.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session: 4,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session: 4 }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -1037,7 +976,7 @@ fn test_provide_multi_dispute_success_and_other() {
|
||||
|
||||
// v0 and v1 vote for 3, v6 votes against
|
||||
let stmts = vec![DisputeStatementSet {
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
session,
|
||||
statements: vec![
|
||||
(
|
||||
@@ -1053,24 +992,16 @@ fn test_provide_multi_dispute_success_and_other() {
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(2),
|
||||
v6.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
DisputeStatement::Valid(ValidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(3),
|
||||
v1.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: true,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session: 3,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: true, candidate_hash, session: 3 }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -1080,29 +1011,25 @@ fn test_provide_multi_dispute_success_and_other() {
|
||||
|
||||
assert_ok!(
|
||||
Pallet::<Test>::process_checked_multi_dispute_data(&stmts),
|
||||
vec![(3, candidate_hash.clone())],
|
||||
vec![(3, candidate_hash)],
|
||||
);
|
||||
|
||||
// v3 votes against 3 and for 5, v2 and v6 vote against 5.
|
||||
let stmts = vec![
|
||||
DisputeStatementSet {
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
session: 3,
|
||||
statements: vec![(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(5),
|
||||
v3.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session: 3,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session: 3 }
|
||||
.signing_payload(),
|
||||
),
|
||||
)],
|
||||
},
|
||||
DisputeStatementSet {
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
session: 5,
|
||||
statements: vec![
|
||||
(
|
||||
@@ -1118,24 +1045,16 @@ fn test_provide_multi_dispute_success_and_other() {
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(6),
|
||||
v2.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session: 5,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session: 5 }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(2),
|
||||
v6.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session: 5,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session: 5 }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -1145,23 +1064,19 @@ fn test_provide_multi_dispute_success_and_other() {
|
||||
let stmts = filter_dispute_set(stmts);
|
||||
assert_ok!(
|
||||
Pallet::<Test>::process_checked_multi_dispute_data(&stmts),
|
||||
vec![(5, candidate_hash.clone())],
|
||||
vec![(5, candidate_hash)],
|
||||
);
|
||||
|
||||
// v2 votes for 3
|
||||
let stmts = vec![DisputeStatementSet {
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
session: 3,
|
||||
statements: vec![(
|
||||
DisputeStatement::Valid(ValidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(6),
|
||||
v2.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: true,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session: 3,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: true, candidate_hash, session: 3 }
|
||||
.signing_payload(),
|
||||
),
|
||||
)],
|
||||
}];
|
||||
@@ -1171,74 +1086,54 @@ fn test_provide_multi_dispute_success_and_other() {
|
||||
let stmts = vec![
|
||||
// 0, 4, and 5 vote against 5
|
||||
DisputeStatementSet {
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
session: 5,
|
||||
statements: vec![
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(0),
|
||||
v0.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session: 5,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session: 5 }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(1),
|
||||
v4.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session: 5,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session: 5 }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(4),
|
||||
v5.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session: 5,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session: 5 }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
],
|
||||
},
|
||||
// 4 and 5 vote for 3
|
||||
DisputeStatementSet {
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
session: 3,
|
||||
statements: vec![
|
||||
(
|
||||
DisputeStatement::Valid(ValidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(1),
|
||||
v4.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: true,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session: 3,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: true, candidate_hash, session: 3 }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
DisputeStatement::Valid(ValidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(4),
|
||||
v5.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: true,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session: 3,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: true, candidate_hash, session: 3 }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -1252,7 +1147,7 @@ fn test_provide_multi_dispute_success_and_other() {
|
||||
vec![
|
||||
(
|
||||
5,
|
||||
candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
DisputeState {
|
||||
validators_for: bitvec![u8, BitOrderLsb0; 0, 0, 0, 0, 0, 1, 0],
|
||||
validators_against: bitvec![u8, BitOrderLsb0; 1, 1, 1, 0, 1, 0, 1],
|
||||
@@ -1262,7 +1157,7 @@ fn test_provide_multi_dispute_success_and_other() {
|
||||
),
|
||||
(
|
||||
3,
|
||||
candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
DisputeState {
|
||||
validators_for: bitvec![u8, BitOrderLsb0; 1, 1, 0, 1, 1, 0, 1],
|
||||
validators_against: bitvec![u8, BitOrderLsb0; 0, 0, 1, 0, 0, 1, 0],
|
||||
@@ -1273,9 +1168,9 @@ fn test_provide_multi_dispute_success_and_other() {
|
||||
]
|
||||
);
|
||||
|
||||
assert!(!Pallet::<Test>::concluded_invalid(3, candidate_hash.clone()));
|
||||
assert!(!Pallet::<Test>::concluded_invalid(4, candidate_hash.clone()));
|
||||
assert!(Pallet::<Test>::concluded_invalid(5, candidate_hash.clone()));
|
||||
assert!(!Pallet::<Test>::concluded_invalid(3, candidate_hash));
|
||||
assert!(!Pallet::<Test>::concluded_invalid(4, candidate_hash));
|
||||
assert!(Pallet::<Test>::concluded_invalid(5, candidate_hash));
|
||||
|
||||
// Ensure the `reward_validator` function was correctly called
|
||||
assert_eq!(
|
||||
@@ -1372,7 +1267,7 @@ fn test_punish_post_conclusion() {
|
||||
let session = 3;
|
||||
|
||||
let stmts = vec![DisputeStatementSet {
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
session,
|
||||
statements: vec![
|
||||
(
|
||||
@@ -1388,60 +1283,40 @@ fn test_punish_post_conclusion() {
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(1),
|
||||
v4.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(2),
|
||||
v6.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(6),
|
||||
v2.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(4),
|
||||
v5.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(5),
|
||||
v3.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
(
|
||||
@@ -1469,7 +1344,7 @@ fn test_punish_post_conclusion() {
|
||||
|
||||
// someone reveals 3 backing vote, 6 votes against
|
||||
let stmts = vec![DisputeStatementSet {
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
session,
|
||||
statements: vec![
|
||||
(
|
||||
@@ -1485,12 +1360,8 @@ fn test_punish_post_conclusion() {
|
||||
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
|
||||
ValidatorIndex(6),
|
||||
v2.sign(
|
||||
&ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session,
|
||||
}
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session }
|
||||
.signing_payload(),
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -1600,37 +1471,28 @@ fn test_check_signature() {
|
||||
let wrong_inclusion_parent = sp_core::H256::repeat_byte(4);
|
||||
|
||||
let statement_1 = DisputeStatement::Valid(ValidDisputeStatementKind::Explicit);
|
||||
let statement_2 = DisputeStatement::Valid(ValidDisputeStatementKind::BackingSeconded(
|
||||
inclusion_parent.clone(),
|
||||
));
|
||||
let wrong_statement_2 = DisputeStatement::Valid(ValidDisputeStatementKind::BackingSeconded(
|
||||
wrong_inclusion_parent.clone(),
|
||||
));
|
||||
let statement_2 =
|
||||
DisputeStatement::Valid(ValidDisputeStatementKind::BackingSeconded(inclusion_parent));
|
||||
let wrong_statement_2 =
|
||||
DisputeStatement::Valid(ValidDisputeStatementKind::BackingSeconded(wrong_inclusion_parent));
|
||||
let statement_3 =
|
||||
DisputeStatement::Valid(ValidDisputeStatementKind::BackingValid(inclusion_parent.clone()));
|
||||
let wrong_statement_3 = DisputeStatement::Valid(ValidDisputeStatementKind::BackingValid(
|
||||
wrong_inclusion_parent.clone(),
|
||||
));
|
||||
DisputeStatement::Valid(ValidDisputeStatementKind::BackingValid(inclusion_parent));
|
||||
let wrong_statement_3 =
|
||||
DisputeStatement::Valid(ValidDisputeStatementKind::BackingValid(wrong_inclusion_parent));
|
||||
let statement_4 = DisputeStatement::Valid(ValidDisputeStatementKind::ApprovalChecking);
|
||||
let statement_5 = DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit);
|
||||
|
||||
let signed_1 = validator_id.sign(
|
||||
&ExplicitDisputeStatement { valid: true, candidate_hash: candidate_hash.clone(), session }
|
||||
.signing_payload(),
|
||||
);
|
||||
let signed_2 =
|
||||
validator_id.sign(&CompactStatement::Seconded(candidate_hash.clone()).signing_payload(
|
||||
&SigningContext { session_index: session, parent_hash: inclusion_parent.clone() },
|
||||
));
|
||||
let signed_3 =
|
||||
validator_id.sign(&CompactStatement::Valid(candidate_hash.clone()).signing_payload(
|
||||
&SigningContext { session_index: session, parent_hash: inclusion_parent.clone() },
|
||||
));
|
||||
let signed_4 =
|
||||
validator_id.sign(&ApprovalVote(candidate_hash.clone()).signing_payload(session));
|
||||
let signed_1 = validator_id
|
||||
.sign(&ExplicitDisputeStatement { valid: true, candidate_hash, session }.signing_payload());
|
||||
let signed_2 = validator_id.sign(&CompactStatement::Seconded(candidate_hash).signing_payload(
|
||||
&SigningContext { session_index: session, parent_hash: inclusion_parent },
|
||||
));
|
||||
let signed_3 = validator_id.sign(&CompactStatement::Valid(candidate_hash).signing_payload(
|
||||
&SigningContext { session_index: session, parent_hash: inclusion_parent },
|
||||
));
|
||||
let signed_4 = validator_id.sign(&ApprovalVote(candidate_hash).signing_payload(session));
|
||||
let signed_5 = validator_id.sign(
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash: candidate_hash.clone(), session }
|
||||
.signing_payload(),
|
||||
&ExplicitDisputeStatement { valid: false, candidate_hash, session }.signing_payload(),
|
||||
);
|
||||
|
||||
assert!(check_signature(
|
||||
@@ -2007,9 +1869,8 @@ fn deduplication_and_sorting_works() {
|
||||
c_hash: &CandidateHash,
|
||||
valid,
|
||||
session| {
|
||||
let payload =
|
||||
ExplicitDisputeStatement { valid, candidate_hash: c_hash.clone(), session }
|
||||
.signing_payload();
|
||||
let payload = ExplicitDisputeStatement { valid, candidate_hash: *c_hash, session }
|
||||
.signing_payload();
|
||||
let sig = validator.sign(&payload);
|
||||
(DisputeStatement::Valid(ValidDisputeStatementKind::Explicit), vidx, sig.clone())
|
||||
};
|
||||
@@ -2031,24 +1892,24 @@ fn deduplication_and_sorting_works() {
|
||||
|
||||
let mut disputes = vec![
|
||||
DisputeStatementSet {
|
||||
candidate_hash: candidate_hash_b.clone(),
|
||||
candidate_hash: candidate_hash_b,
|
||||
session: 2,
|
||||
statements: vec![explicit_triple_b.clone(), explicit_triple_b_bad.clone()],
|
||||
},
|
||||
// same session as above
|
||||
DisputeStatementSet {
|
||||
candidate_hash: candidate_hash_c.clone(),
|
||||
candidate_hash: candidate_hash_c,
|
||||
session: 2,
|
||||
statements: vec![explicit_triple_c, explicit_triple_c_bad],
|
||||
},
|
||||
// the duplicate set
|
||||
DisputeStatementSet {
|
||||
candidate_hash: candidate_hash_b.clone(),
|
||||
candidate_hash: candidate_hash_b,
|
||||
session: 2,
|
||||
statements: vec![explicit_triple_b.clone(), explicit_triple_b_bad.clone()],
|
||||
},
|
||||
DisputeStatementSet {
|
||||
candidate_hash: candidate_hash_a.clone(),
|
||||
candidate_hash: candidate_hash_a,
|
||||
session: 1,
|
||||
statements: vec![explicit_triple_a, explicit_triple_a_bad],
|
||||
},
|
||||
@@ -2116,19 +1977,11 @@ fn filter_removes_duplicates_within_set() {
|
||||
|
||||
let candidate_hash = CandidateHash(sp_core::H256::repeat_byte(1));
|
||||
|
||||
let payload = ExplicitDisputeStatement {
|
||||
valid: true,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session: 1,
|
||||
}
|
||||
.signing_payload();
|
||||
let payload =
|
||||
ExplicitDisputeStatement { valid: true, candidate_hash, session: 1 }.signing_payload();
|
||||
|
||||
let payload_against = ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session: 1,
|
||||
}
|
||||
.signing_payload();
|
||||
let payload_against =
|
||||
ExplicitDisputeStatement { valid: false, candidate_hash, session: 1 }.signing_payload();
|
||||
|
||||
let sig_a = v0.sign(&payload);
|
||||
let sig_b = v0.sign(&payload);
|
||||
@@ -2136,7 +1989,7 @@ fn filter_removes_duplicates_within_set() {
|
||||
let sig_d = v1.sign(&payload_against);
|
||||
|
||||
let statements = DisputeStatementSet {
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
session: 1,
|
||||
statements: vec![
|
||||
(
|
||||
@@ -2172,7 +2025,7 @@ fn filter_removes_duplicates_within_set() {
|
||||
assert_eq!(
|
||||
statements,
|
||||
Some(CheckedDisputeStatementSet::unchecked_from_unchecked(DisputeStatementSet {
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
session: 1,
|
||||
statements: vec![
|
||||
(
|
||||
@@ -2217,7 +2070,7 @@ fn filter_bad_signatures_correctly_detects_single_sided() {
|
||||
let candidate_hash_a = CandidateHash(sp_core::H256::repeat_byte(1));
|
||||
|
||||
let payload = |c_hash: &CandidateHash, valid| {
|
||||
ExplicitDisputeStatement { valid, candidate_hash: c_hash.clone(), session: 1 }
|
||||
ExplicitDisputeStatement { valid, candidate_hash: *c_hash, session: 1 }
|
||||
.signing_payload()
|
||||
};
|
||||
|
||||
@@ -2228,7 +2081,7 @@ fn filter_bad_signatures_correctly_detects_single_sided() {
|
||||
let sig_1 = v1.sign(&payload_a_bad);
|
||||
|
||||
let statements = vec![DisputeStatementSet {
|
||||
candidate_hash: candidate_hash_a.clone(),
|
||||
candidate_hash: candidate_hash_a,
|
||||
session: 1,
|
||||
statements: vec![
|
||||
(
|
||||
@@ -2262,17 +2115,13 @@ fn filter_removes_session_out_of_bounds() {
|
||||
|
||||
let candidate_hash = CandidateHash(sp_core::H256::repeat_byte(1));
|
||||
|
||||
let payload = ExplicitDisputeStatement {
|
||||
valid: true,
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
session: 1,
|
||||
}
|
||||
.signing_payload();
|
||||
let payload =
|
||||
ExplicitDisputeStatement { valid: true, candidate_hash, session: 1 }.signing_payload();
|
||||
|
||||
let sig_a = v0.sign(&payload);
|
||||
|
||||
let statements = vec![DisputeStatementSet {
|
||||
candidate_hash: candidate_hash.clone(),
|
||||
candidate_hash,
|
||||
session: 100,
|
||||
statements: vec![(
|
||||
DisputeStatement::Valid(ValidDisputeStatementKind::Explicit),
|
||||
@@ -2297,7 +2146,6 @@ fn filter_removes_concluded_ancient() {
|
||||
dispute_post_conclusion_acceptance_period,
|
||||
..Default::default()
|
||||
},
|
||||
..Default::default()
|
||||
},
|
||||
..Default::default()
|
||||
};
|
||||
@@ -2335,26 +2183,20 @@ fn filter_removes_concluded_ancient() {
|
||||
},
|
||||
);
|
||||
|
||||
let payload_a = ExplicitDisputeStatement {
|
||||
valid: true,
|
||||
candidate_hash: candidate_hash_a.clone(),
|
||||
session: 1,
|
||||
}
|
||||
.signing_payload();
|
||||
let payload_a =
|
||||
ExplicitDisputeStatement { valid: true, candidate_hash: candidate_hash_a, session: 1 }
|
||||
.signing_payload();
|
||||
|
||||
let payload_b = ExplicitDisputeStatement {
|
||||
valid: true,
|
||||
candidate_hash: candidate_hash_b.clone(),
|
||||
session: 1,
|
||||
}
|
||||
.signing_payload();
|
||||
let payload_b =
|
||||
ExplicitDisputeStatement { valid: true, candidate_hash: candidate_hash_b, session: 1 }
|
||||
.signing_payload();
|
||||
|
||||
let sig_a = v0.sign(&payload_a);
|
||||
let sig_b = v0.sign(&payload_b);
|
||||
|
||||
let statements = vec![
|
||||
DisputeStatementSet {
|
||||
candidate_hash: candidate_hash_a.clone(),
|
||||
candidate_hash: candidate_hash_a,
|
||||
session: 1,
|
||||
statements: vec![(
|
||||
DisputeStatement::Valid(ValidDisputeStatementKind::Explicit),
|
||||
@@ -2363,7 +2205,7 @@ fn filter_removes_concluded_ancient() {
|
||||
)],
|
||||
},
|
||||
DisputeStatementSet {
|
||||
candidate_hash: candidate_hash_b.clone(),
|
||||
candidate_hash: candidate_hash_b,
|
||||
session: 1,
|
||||
statements: vec![(
|
||||
DisputeStatement::Valid(ValidDisputeStatementKind::Explicit),
|
||||
@@ -2378,7 +2220,7 @@ fn filter_removes_concluded_ancient() {
|
||||
assert_eq!(
|
||||
statements,
|
||||
vec![CheckedDisputeStatementSet::unchecked_from_unchecked(DisputeStatementSet {
|
||||
candidate_hash: candidate_hash_b.clone(),
|
||||
candidate_hash: candidate_hash_b,
|
||||
session: 1,
|
||||
statements: vec![(
|
||||
DisputeStatement::Valid(ValidDisputeStatementKind::Explicit),
|
||||
@@ -2408,19 +2250,13 @@ fn filter_removes_duplicate_statements_sets() {
|
||||
|
||||
let candidate_hash_a = CandidateHash(sp_core::H256::repeat_byte(1));
|
||||
|
||||
let payload = ExplicitDisputeStatement {
|
||||
valid: true,
|
||||
candidate_hash: candidate_hash_a.clone(),
|
||||
session: 1,
|
||||
}
|
||||
.signing_payload();
|
||||
let payload =
|
||||
ExplicitDisputeStatement { valid: true, candidate_hash: candidate_hash_a, session: 1 }
|
||||
.signing_payload();
|
||||
|
||||
let payload_against = ExplicitDisputeStatement {
|
||||
valid: false,
|
||||
candidate_hash: candidate_hash_a.clone(),
|
||||
session: 1,
|
||||
}
|
||||
.signing_payload();
|
||||
let payload_against =
|
||||
ExplicitDisputeStatement { valid: false, candidate_hash: candidate_hash_a, session: 1 }
|
||||
.signing_payload();
|
||||
|
||||
let sig_a = v0.sign(&payload);
|
||||
let sig_a_against = v1.sign(&payload_against);
|
||||
@@ -2440,12 +2276,12 @@ fn filter_removes_duplicate_statements_sets() {
|
||||
|
||||
let mut sets = vec![
|
||||
DisputeStatementSet {
|
||||
candidate_hash: candidate_hash_a.clone(),
|
||||
candidate_hash: candidate_hash_a,
|
||||
session: 1,
|
||||
statements: statements.clone(),
|
||||
},
|
||||
DisputeStatementSet {
|
||||
candidate_hash: candidate_hash_a.clone(),
|
||||
candidate_hash: candidate_hash_a,
|
||||
session: 1,
|
||||
statements: statements.clone(),
|
||||
},
|
||||
@@ -2459,11 +2295,7 @@ fn filter_removes_duplicate_statements_sets() {
|
||||
|
||||
assert_eq!(
|
||||
sets,
|
||||
vec![DisputeStatementSet {
|
||||
candidate_hash: candidate_hash_a.clone(),
|
||||
session: 1,
|
||||
statements,
|
||||
}]
|
||||
vec![DisputeStatementSet { candidate_hash: candidate_hash_a, session: 1, statements }]
|
||||
);
|
||||
})
|
||||
}
|
||||
@@ -2480,17 +2312,14 @@ fn filter_ignores_single_sided() {
|
||||
|
||||
let candidate_hash_a = CandidateHash(sp_core::H256::repeat_byte(1));
|
||||
|
||||
let payload = ExplicitDisputeStatement {
|
||||
valid: true,
|
||||
candidate_hash: candidate_hash_a.clone(),
|
||||
session: 1,
|
||||
}
|
||||
.signing_payload();
|
||||
let payload =
|
||||
ExplicitDisputeStatement { valid: true, candidate_hash: candidate_hash_a, session: 1 }
|
||||
.signing_payload();
|
||||
|
||||
let sig_a = v0.sign(&payload);
|
||||
|
||||
let statements = vec![DisputeStatementSet {
|
||||
candidate_hash: candidate_hash_a.clone(),
|
||||
candidate_hash: candidate_hash_a,
|
||||
session: 1,
|
||||
statements: vec![(
|
||||
DisputeStatement::Valid(ValidDisputeStatementKind::Explicit),
|
||||
@@ -2517,17 +2346,14 @@ fn import_ignores_single_sided() {
|
||||
|
||||
let candidate_hash_a = CandidateHash(sp_core::H256::repeat_byte(1));
|
||||
|
||||
let payload = ExplicitDisputeStatement {
|
||||
valid: true,
|
||||
candidate_hash: candidate_hash_a.clone(),
|
||||
session: 1,
|
||||
}
|
||||
.signing_payload();
|
||||
let payload =
|
||||
ExplicitDisputeStatement { valid: true, candidate_hash: candidate_hash_a, session: 1 }
|
||||
.signing_payload();
|
||||
|
||||
let sig_a = v0.sign(&payload);
|
||||
|
||||
let statements = vec![DisputeStatementSet {
|
||||
candidate_hash: candidate_hash_a.clone(),
|
||||
candidate_hash: candidate_hash_a,
|
||||
session: 1,
|
||||
statements: vec![(
|
||||
DisputeStatement::Valid(ValidDisputeStatementKind::Explicit),
|
||||
|
||||
Reference in New Issue
Block a user