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

Async backing statement distribution: Candidates tests #6658

Merged
mrcnski merged 11 commits into from
Feb 16, 2023
Merged

Async backing statement distribution: Candidates tests #6658

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5d9b98d
Add some tests in `candidates.rs`
mrcnski Feb 1, 2023
512e61d
Add `test_hypothetical_frontiers`
mrcnski Feb 1, 2023
cacba32
Add `test_returned_post_confirmation`
mrcnski Feb 1, 2023
b8c876e
Merge branch 'rh-async-backing-statement-distribution' into mrcnski/a…
mrcnski Feb 1, 2023
7f9bbfa
Remove pretty-assertions
mrcnski Feb 2, 2023
be9b6b1
Update Cargo.lock
mrcnski Feb 2, 2023
afd98d5
Merge branch 'rh-async-backing-statement-distribution' into mrcnski/a…
mrcnski Feb 7, 2023
5048016
Address PR feedback
mrcnski Feb 7, 2023
f942d40
Merge branch 'rh-async-backing-statement-distribution' into mrcnski/a…
mrcnski Feb 12, 2023
8a4634a
Merge branch 'rh-async-backing-statement-distribution' into mrcnski/a…
mrcnski Feb 16, 2023
0c61572
Address nits
mrcnski Feb 16, 2023
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
12 changes: 9 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

101 changes: 41 additions & 60 deletions node/core/prospective-parachains/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.

use super::*;
use ::polkadot_primitives_test_helpers::{dummy_candidate_receipt_bad_sig, dummy_hash};
use ::polkadot_primitives_test_helpers::make_candidate;
Copy link
Copy Markdown
Contributor

@rphmeier rphmeier Feb 16, 2023

Choose a reason for hiding this comment

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

Leading :: is very 2018-era Rust - not sure why that was there, but it should be replaced

use assert_matches::assert_matches;
use polkadot_node_subsystem::{
errors::RuntimeApiError,
Expand All @@ -27,11 +27,9 @@ use polkadot_node_subsystem::{
use polkadot_node_subsystem_test_helpers as test_helpers;
use polkadot_node_subsystem_types::{jaeger, ActivatedLeaf, LeafStatus};
use polkadot_primitives::{
v2::{
CandidateCommitments, HeadData, Header, PersistedValidationData, ScheduledCore,
ValidationCodeHash,
},
vstaging::{AsyncBackingParameters, Constraints, InboundHrmpLimitations},
CommittedCandidateReceipt, HeadData, Header, PersistedValidationData, ScheduledCore,
ValidationCodeHash,
};
use std::sync::Arc;

Expand Down Expand Up @@ -70,42 +68,6 @@ fn dummy_constraints(
}
}

fn dummy_pvd(parent_head: HeadData, relay_parent_number: u32) -> PersistedValidationData {
PersistedValidationData {
parent_head,
relay_parent_number,
max_pov_size: MAX_POV_SIZE,
relay_parent_storage_root: dummy_hash(),
}
}

fn make_candidate(
leaf: &TestLeaf,
para_id: ParaId,
parent_head: HeadData,
head_data: HeadData,
validation_code_hash: ValidationCodeHash,
) -> (CommittedCandidateReceipt, PersistedValidationData) {
let pvd = dummy_pvd(parent_head, leaf.number);
let commitments = CandidateCommitments {
head_data,
horizontal_messages: Vec::new(),
upward_messages: Vec::new(),
new_validation_code: None,
processed_downward_messages: 0,
hrmp_watermark: leaf.number,
};

let mut candidate = dummy_candidate_receipt_bad_sig(leaf.hash, Some(Default::default()));
candidate.commitments_hash = commitments.hash();
candidate.descriptor.para_id = para_id;
candidate.descriptor.persisted_validation_data_hash = pvd.hash();
candidate.descriptor.validation_code_hash = validation_code_hash;
let candidate = CommittedCandidateReceipt { descriptor: candidate.descriptor, commitments };

(candidate, pvd)
}

struct TestState {
availability_cores: Vec<CoreState>,
validation_code_hash: ValidationCodeHash,
Expand Down Expand Up @@ -539,7 +501,8 @@ fn send_candidates_and_check_if_found() {

// Candidate A1
let (candidate_a1, pvd_a1) = make_candidate(
&leaf_a,
leaf_a.hash,
leaf_a.number,
1.into(),
HeadData(vec![1, 2, 3]),
HeadData(vec![1]),
Expand All @@ -550,7 +513,8 @@ fn send_candidates_and_check_if_found() {

// Candidate A2
let (candidate_a2, pvd_a2) = make_candidate(
&leaf_a,
leaf_a.hash,
leaf_a.number,
2.into(),
HeadData(vec![2, 3, 4]),
HeadData(vec![2]),
Expand All @@ -561,7 +525,8 @@ fn send_candidates_and_check_if_found() {

// Candidate B
let (candidate_b, pvd_b) = make_candidate(
&leaf_b,
leaf_b.hash,
leaf_b.number,
1.into(),
HeadData(vec![3, 4, 5]),
HeadData(vec![3]),
Expand All @@ -572,7 +537,8 @@ fn send_candidates_and_check_if_found() {

// Candidate C
let (candidate_c, pvd_c) = make_candidate(
&leaf_c,
leaf_c.hash,
leaf_c.number,
2.into(),
HeadData(vec![6, 7, 8]),
HeadData(vec![4]),
Expand Down Expand Up @@ -649,7 +615,8 @@ fn check_candidate_parent_leaving_view() {

// Candidate A1
let (candidate_a1, pvd_a1) = make_candidate(
&leaf_a,
leaf_a.hash,
leaf_a.number,
1.into(),
HeadData(vec![1, 2, 3]),
HeadData(vec![1]),
Expand All @@ -660,7 +627,8 @@ fn check_candidate_parent_leaving_view() {

// Candidate A2
let (candidate_a2, pvd_a2) = make_candidate(
&leaf_a,
leaf_a.hash,
leaf_a.number,
2.into(),
HeadData(vec![2, 3, 4]),
HeadData(vec![2]),
Expand All @@ -671,7 +639,8 @@ fn check_candidate_parent_leaving_view() {

// Candidate B
let (candidate_b, pvd_b) = make_candidate(
&leaf_b,
leaf_b.hash,
leaf_b.number,
1.into(),
HeadData(vec![3, 4, 5]),
HeadData(vec![3]),
Expand All @@ -682,7 +651,8 @@ fn check_candidate_parent_leaving_view() {

// Candidate C
let (candidate_c, pvd_c) = make_candidate(
&leaf_c,
leaf_c.hash,
leaf_c.number,
2.into(),
HeadData(vec![6, 7, 8]),
HeadData(vec![4]),
Expand Down Expand Up @@ -771,7 +741,8 @@ fn check_candidate_on_multiple_forks() {

// Candidate on leaf A.
let (candidate_a, pvd_a) = make_candidate(
&leaf_a,
leaf_a.hash,
leaf_a.number,
1.into(),
HeadData(vec![1, 2, 3]),
HeadData(vec![1]),
Expand All @@ -782,7 +753,8 @@ fn check_candidate_on_multiple_forks() {

// Candidate on leaf B.
let (candidate_b, pvd_b) = make_candidate(
&leaf_b,
leaf_b.hash,
leaf_b.number,
1.into(),
HeadData(vec![3, 4, 5]),
HeadData(vec![1]),
Expand All @@ -793,7 +765,8 @@ fn check_candidate_on_multiple_forks() {

// Candidate on leaf C.
let (candidate_c, pvd_c) = make_candidate(
&leaf_c,
leaf_c.hash,
leaf_c.number,
1.into(),
HeadData(vec![5, 6, 7]),
HeadData(vec![1]),
Expand Down Expand Up @@ -860,7 +833,8 @@ fn check_backable_query() {

// Candidate A
let (candidate_a, pvd_a) = make_candidate(
&leaf_a,
leaf_a.hash,
leaf_a.number,
1.into(),
HeadData(vec![1, 2, 3]),
HeadData(vec![1]),
Expand All @@ -871,7 +845,8 @@ fn check_backable_query() {

// Candidate B
let (mut candidate_b, pvd_b) = make_candidate(
&leaf_a,
leaf_a.hash,
leaf_a.number,
1.into(),
HeadData(vec![1]),
HeadData(vec![2]),
Expand Down Expand Up @@ -970,7 +945,8 @@ fn check_depth_query() {

// Candidate A.
let (candidate_a, pvd_a) = make_candidate(
&leaf_a,
leaf_a.hash,
leaf_a.number,
1.into(),
HeadData(vec![1, 2, 3]),
HeadData(vec![1]),
Expand All @@ -981,7 +957,8 @@ fn check_depth_query() {

// Candidate B.
let (candidate_b, pvd_b) = make_candidate(
&leaf_a,
leaf_a.hash,
leaf_a.number,
1.into(),
HeadData(vec![1]),
HeadData(vec![2]),
Expand All @@ -992,7 +969,8 @@ fn check_depth_query() {

// Candidate C.
let (candidate_c, pvd_c) = make_candidate(
&leaf_a,
leaf_a.hash,
leaf_a.number,
1.into(),
HeadData(vec![2]),
HeadData(vec![3]),
Expand Down Expand Up @@ -1120,7 +1098,8 @@ fn check_pvd_query() {

// Candidate A.
let (candidate_a, pvd_a) = make_candidate(
&leaf_a,
leaf_a.hash,
leaf_a.number,
1.into(),
HeadData(vec![1, 2, 3]),
HeadData(vec![1]),
Expand All @@ -1130,7 +1109,8 @@ fn check_pvd_query() {

// Candidate B.
let (candidate_b, pvd_b) = make_candidate(
&leaf_a,
leaf_a.hash,
leaf_a.number,
1.into(),
HeadData(vec![1]),
HeadData(vec![2]),
Expand All @@ -1140,7 +1120,8 @@ fn check_pvd_query() {

// Candidate C.
let (candidate_c, pvd_c) = make_candidate(
&leaf_a,
leaf_a.hash,
leaf_a.number,
1.into(),
HeadData(vec![2]),
HeadData(vec![3]),
Expand Down
2 changes: 1 addition & 1 deletion node/network/statement-distribution/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ fatality = "0.0.6"
bitvec = "1"

[dev-dependencies]
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
assert_matches = "1.4.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
Expand Down
Loading