Update Substrate & Polkadot (#770)

* Update Substrate & Polkadot

* Disable tests without debug assertions
This commit is contained in:
Bastian Köcher
2021-11-19 23:46:14 +01:00
committed by GitHub
parent 72a373411a
commit 801c1bef0a
7 changed files with 242 additions and 280 deletions
+236 -237
View File
File diff suppressed because it is too large Load Diff
-9
View File
@@ -16,7 +16,6 @@
use cumulus_primitives_core::ParaId; use cumulus_primitives_core::ParaId;
use cumulus_test_service::{initial_head_data, run_relay_chain_validator_node, Keyring::*}; use cumulus_test_service::{initial_head_data, run_relay_chain_validator_node, Keyring::*};
use futures::join;
#[substrate_test_utils::test] #[substrate_test_utils::test]
#[ignore] #[ignore]
@@ -71,12 +70,4 @@ async fn sync_blocks_from_tip_without_being_connected_to_a_collator() {
.await; .await;
eve.wait_for_blocks(7).await; eve.wait_for_blocks(7).await;
join!(
alice.task_manager.clean_shutdown(),
bob.task_manager.clean_shutdown(),
charlie.task_manager.clean_shutdown(),
dave.task_manager.clean_shutdown(),
eve.task_manager.clean_shutdown(),
);
} }
@@ -16,7 +16,6 @@
use cumulus_primitives_core::ParaId; use cumulus_primitives_core::ParaId;
use cumulus_test_service::{initial_head_data, Keyring::*}; use cumulus_test_service::{initial_head_data, Keyring::*};
use futures::join;
use std::sync::Arc; use std::sync::Arc;
/// Tests the PoV recovery. /// Tests the PoV recovery.
@@ -86,11 +85,4 @@ async fn pov_recovery() {
.await; .await;
dave.wait_for_blocks(7).await; dave.wait_for_blocks(7).await;
join!(
alice.task_manager.clean_shutdown(),
bob.task_manager.clean_shutdown(),
charlie.task_manager.clean_shutdown(),
dave.task_manager.clean_shutdown(),
);
} }
+5 -1
View File
@@ -15,7 +15,9 @@
use super::*; use super::*;
use cumulus_primitives_core::XcmpMessageHandler; use cumulus_primitives_core::XcmpMessageHandler;
use mock::{new_test_ext, Test, XcmpQueue}; #[cfg(debug_assertions)]
use mock::Test;
use mock::{new_test_ext, XcmpQueue};
#[test] #[test]
fn one_message_does_not_panic() { fn one_message_does_not_panic() {
@@ -30,6 +32,7 @@ fn one_message_does_not_panic() {
#[test] #[test]
#[should_panic = "Invalid incoming blob message data"] #[should_panic = "Invalid incoming blob message data"]
#[cfg(debug_assertions)]
fn bad_message_is_handled() { fn bad_message_is_handled() {
new_test_ext().execute_with(|| { new_test_ext().execute_with(|| {
let bad_data = vec![ let bad_data = vec![
@@ -46,6 +49,7 @@ fn bad_message_is_handled() {
#[test] #[test]
#[should_panic = "Invalid incoming blob message data"] #[should_panic = "Invalid incoming blob message data"]
#[cfg(debug_assertions)]
fn other_bad_message_is_handled() { fn other_bad_message_is_handled() {
new_test_ext().execute_with(|| { new_test_ext().execute_with(|| {
let bad_data = vec![ let bad_data = vec![
@@ -238,15 +238,6 @@ fn transaction_throughput_benchmarks(c: &mut Criterion) {
) )
}, },
); );
runtime.block_on(async {
join!(
alice.task_manager.clean_shutdown(),
bob.task_manager.clean_shutdown(),
charlie.task_manager.clean_shutdown(),
dave.task_manager.clean_shutdown(),
)
});
} }
criterion_group!(benches, transaction_throughput_benchmarks); criterion_group!(benches, transaction_throughput_benchmarks);
@@ -16,7 +16,6 @@
use cumulus_primitives_core::ParaId; use cumulus_primitives_core::ParaId;
use cumulus_test_service::{initial_head_data, run_relay_chain_validator_node, Keyring::*}; use cumulus_test_service::{initial_head_data, run_relay_chain_validator_node, Keyring::*};
use futures::join;
#[substrate_test_utils::test] #[substrate_test_utils::test]
#[ignore] #[ignore]
@@ -64,11 +63,4 @@ async fn test_collating_and_non_collator_mode_catching_up() {
.build() .build()
.await; .await;
dave.wait_for_blocks(7).await; dave.wait_for_blocks(7).await;
join!(
alice.task_manager.clean_shutdown(),
bob.task_manager.clean_shutdown(),
charlie.task_manager.clean_shutdown(),
dave.task_manager.clean_shutdown(),
);
} }
@@ -16,7 +16,7 @@
use cumulus_primitives_core::ParaId; use cumulus_primitives_core::ParaId;
use cumulus_test_service::{initial_head_data, run_relay_chain_validator_node, Keyring::*}; use cumulus_test_service::{initial_head_data, run_relay_chain_validator_node, Keyring::*};
use futures::{join, StreamExt}; use futures::StreamExt;
use sc_client_api::BlockchainEvents; use sc_client_api::BlockchainEvents;
use sp_runtime::generic::BlockId; use sp_runtime::generic::BlockId;
@@ -93,11 +93,4 @@ async fn test_runtime_upgrade() {
} }
} }
} }
join!(
alice.task_manager.clean_shutdown(),
bob.task_manager.clean_shutdown(),
charlie.task_manager.clean_shutdown(),
dave.task_manager.clean_shutdown(),
);
} }