Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Fix incomplete sorting. #4795

Merged
paritytech-processbot merged 8 commits into from
Jan 27, 2022
Merged

Fix incomplete sorting. #4795

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
479deff
Fix incomplete sorting.
eskimor Jan 27, 2022
e1188d2
fmt.
eskimor Jan 27, 2022
53b8280
Better test.
eskimor Jan 27, 2022
1398ae9
Update runtime/parachains/src/disputes.rs
eskimor Jan 27, 2022
5f92eb2
chore fmt
drahnr Jan 27, 2022
5bad807
simplify the sorting for two items
drahnr Jan 27, 2022
8c3d373
add test for assure duplicates are detected
drahnr Jan 27, 2022
6f5cdfa
fixup tests
drahnr Jan 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 39 additions & 43 deletions runtime/parachains/src/disputes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,14 @@ where
(None, Some(_)) => Ordering::Greater,
(Some(_), None) => Ordering::Less,
// For local disputes, prioritize those that occur at an earlier height.
(Some(a_height), Some(b_height)) => a_height.cmp(&b_height),
(Some(a_height), Some(b_height)) => {
let height_ord = a_height.cmp(&b_height);
if height_ord == Ordering::Equal {
a.candidate_hash.cmp(&b.candidate_hash)
Copy link
Contributor

@drahnr drahnr Jan 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

} else {
height_ord
}
},
// Prioritize earlier remote disputes using session as rough proxy.
(None, None) => {
let session_ord = a.session.cmp(&b.session);
Expand Down Expand Up @@ -163,7 +170,19 @@ pub trait DisputesHandler<BlockNumber: Ord> {
) {
return Err(())
}
if statement_sets.as_slice().windows(2).any(|sub| sub.get(0) == sub.get(1)) {
let compare_statement_sets_window_same_dispute = |sub: &[DisputeStatementSet]| {
match (sub.get(0), sub.get(1)) {
// should not be possible:
(None, None) | (None, Some(_)) | (Some(_), None) => false,
(Some(set1), Some(set2)) =>
set1.session == set2.session && set1.candidate_hash == set2.candidate_hash,
}
};
if statement_sets
.as_slice()
.windows(2)
.any(compare_statement_sets_window_same_dispute)
{
return Err(())
}
Ok(())
Expand Down Expand Up @@ -3490,67 +3509,44 @@ mod tests {
let sig_a = v0.sign(&payload);
let sig_a_against = v1.sign(&payload_against);

let sig_b = v0.sign(&payload);
let sig_b_against = v1.sign(&payload_against);
let statements = vec![
(
DisputeStatement::Valid(ValidDisputeStatementKind::Explicit),
ValidatorIndex(0),
sig_a.clone(),
),
(
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
ValidatorIndex(1),
sig_a_against.clone(),
),
];

let mut statements = vec![
let mut sets = vec![
DisputeStatementSet {
candidate_hash: candidate_hash_a.clone(),
session: 1,
statements: vec![
(
DisputeStatement::Valid(ValidDisputeStatementKind::Explicit),
ValidatorIndex(0),
sig_a.clone(),
),
(
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
ValidatorIndex(1),
sig_a_against.clone(),
),
],
statements: statements.clone(),
},
DisputeStatementSet {
candidate_hash: candidate_hash_a.clone(),
session: 1,
statements: vec![
(
DisputeStatement::Valid(ValidDisputeStatementKind::Explicit),
ValidatorIndex(0),
sig_b.clone(),
),
(
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
ValidatorIndex(1),
sig_b_against.clone(),
),
],
statements: statements.clone(),
},
];

// `Err(())` indicates presence of duplicates
assert!(<Pallet::<Test> as DisputesHandler<
<Test as frame_system::Config>::BlockNumber,
>>::deduplicate_and_sort_dispute_data(&mut statements)
>>::deduplicate_and_sort_dispute_data(&mut sets)
.is_err());

assert_eq!(
statements,
sets,
vec![DisputeStatementSet {
candidate_hash: candidate_hash_a.clone(),
session: 1,
statements: vec![
(
DisputeStatement::Valid(ValidDisputeStatementKind::Explicit),
ValidatorIndex(0),
sig_a.clone(),
),
(
DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit),
ValidatorIndex(1),
sig_a_against.clone(),
),
],
statements,
}]
);
})
Expand Down