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

CI: run disputes tests #3962

Merged
6 commits merged into from
Sep 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions node/core/dispute-coordinator/src/real/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ use polkadot_node_primitives::{
use polkadot_node_subsystem::{
errors::{ChainApiError, RuntimeApiError},
messages::{
BlockDescription, ChainApiMessage, DisputeCoordinatorMessage, DisputeDistributionMessage,
BlockDescription, DisputeCoordinatorMessage, DisputeDistributionMessage,
DisputeParticipationMessage, ImportStatementsResult,
},
overseer, FromOverseer, OverseerSignal, SpawnedSubsystem, SubsystemContext, SubsystemError,
Expand Down Expand Up @@ -631,7 +631,6 @@ async fn handle_import_statements(
session: SessionIndex,
statements: Vec<(SignedDisputeStatement, ValidatorIndex)>,
now: Timestamp,
pending_confirmation: oneshot::Sender<ImportStatementsResult>,
metrics: &Metrics,
) -> Result<ImportStatementsResult, Error> {
if state.highest_session.map_or(true, |h| session + DISPUTE_WINDOW < h) {
Expand Down Expand Up @@ -913,7 +912,7 @@ async fn issue_local_statement(
now,
metrics,
)
.await?
.await
{
Err(_) => {
tracing::error!(
Expand Down
22 changes: 4 additions & 18 deletions node/core/dispute-coordinator/src/real/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ use overseer::TimeoutExt;
use parity_scale_codec::Encode;
use polkadot_node_subsystem::{
jaeger,
messages::{
AllMessages, BlockDescription, ChainApiMessage, RuntimeApiMessage, RuntimeApiRequest,
},
messages::{AllMessages, BlockDescription, RuntimeApiMessage, RuntimeApiRequest},
ActivatedLeaf, ActiveLeavesUpdate, LeafStatus,
};
use polkadot_node_subsystem_test_helpers::{make_subsystem_context, TestSubsystemContextHandle};
Expand Down Expand Up @@ -170,33 +168,22 @@ impl TestState {
)))
.await;

self.handle_sync_queries(virtual_overseer, block_hash, block_header, session)
.await;
self.handle_sync_queries(virtual_overseer, block_hash, session).await;
}

async fn handle_sync_queries(
&self,
virtual_overseer: &mut VirtualOverseer,
block_hash: Hash,
block_header: Header,
session: SessionIndex,
) {
assert_matches!(
virtual_overseer.recv().await,
AllMessages::ChainApi(ChainApiMessage::BlockHeader(h, tx)) => {
assert_eq!(h, block_hash);
let _ = tx.send(Ok(Some(block_header)));
}
);

assert_matches!(
virtual_overseer.recv().await,
AllMessages::RuntimeApi(RuntimeApiMessage::Request(
h,
RuntimeApiRequest::SessionIndexForChild(tx),
)) => {
let parent_hash = session_to_hash(session, b"parent");
assert_eq!(h, parent_hash);
assert_eq!(h, block_hash);
let _ = tx.send(Ok(session));
}
);
Expand Down Expand Up @@ -236,8 +223,7 @@ impl TestState {
)))
.await;

let header = self.headers.get(leaf).unwrap().clone();
self.handle_sync_queries(virtual_overseer, *leaf, header, session).await;
self.handle_sync_queries(virtual_overseer, *leaf, session).await;
}
}

Expand Down
1 change: 1 addition & 0 deletions scripts/gitlab/test_linux_stable.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ set -e
#shellcheck source=../common/lib.sh
source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/../common/lib.sh"

time cargo test --release --locked -p polkadot-node-core-dispute-coordinator --features disputes
time cargo test --workspace --release --verbose --locked --features=runtime-benchmarks