Update Substrate & Polkadot (#770)

* Update Substrate & Polkadot

* Disable tests without debug assertions

cumulus/client/network/tests/sync.rs

@@ -16,7 +16,6 @@
 
 use cumulus_primitives_core::ParaId;
 use cumulus_test_service::{initial_head_data, run_relay_chain_validator_node, Keyring::*};
-use futures::join;
 
 #[substrate_test_utils::test]
 #[ignore]
@@ -71,12 +70,4 @@ async fn sync_blocks_from_tip_without_being_connected_to_a_collator() {
 		.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(),
-	);
 }

cumulus/client/pov-recovery/tests/pov_recovery.rs

@@ -16,7 +16,6 @@
 
 use cumulus_primitives_core::ParaId;
 use cumulus_test_service::{initial_head_data, Keyring::*};
-use futures::join;
 use std::sync::Arc;
 
 /// Tests the PoV recovery.
@@ -86,11 +85,4 @@ async fn pov_recovery() {
 		.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(),
-	);
 }

cumulus/pallets/xcmp-queue/src/tests.rs

@@ -15,7 +15,9 @@
 
 use super::*;
 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]
 fn one_message_does_not_panic() {
@@ -30,6 +32,7 @@ fn one_message_does_not_panic() {
 
 #[test]
 #[should_panic = "Invalid incoming blob message data"]
+#[cfg(debug_assertions)]
 fn bad_message_is_handled() {
 	new_test_ext().execute_with(|| {
 		let bad_data = vec![
@@ -46,6 +49,7 @@ fn bad_message_is_handled() {
 
 #[test]
 #[should_panic = "Invalid incoming blob message data"]
+#[cfg(debug_assertions)]
 fn other_bad_message_is_handled() {
 	new_test_ext().execute_with(|| {
 		let bad_data = vec![

cumulus/test/service/benches/transaction_throughput.rs

@@ -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);

cumulus/test/service/tests/integration.rs

@@ -16,7 +16,6 @@
 
 use cumulus_primitives_core::ParaId;
 use cumulus_test_service::{initial_head_data, run_relay_chain_validator_node, Keyring::*};
-use futures::join;
 
 #[substrate_test_utils::test]
 #[ignore]
@@ -64,11 +63,4 @@ async fn test_collating_and_non_collator_mode_catching_up() {
 		.build()
 		.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(),
-	);
 }

cumulus/test/service/tests/runtime_upgrade.rs

@@ -16,7 +16,7 @@
 
 use cumulus_primitives_core::ParaId;
 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 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(),
-	);
 }