From ed41b4302df24b9eb8440b71aaf879e4ea3c1496 Mon Sep 17 00:00:00 2001
From: yrong1997 <yrong1997@gmail.com>
Date: Fri, 22 Oct 2021 13:09:29 +0800
Subject: [PATCH] Fix VersionWrapper (#372)

---
 Cargo.toml                                           | 12 ++++++++----
 integration-tests/src/kusama_cross_chain_transfer.rs |  1 -
 runtime/asgard/src/lib.rs                            |  2 +-
 runtime/bifrost/src/lib.rs                           |  2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 047a440ff..8de3ea9ab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,6 +22,14 @@ members = [
 	"xcm-support",
 ]
 
+resolver = "2"
+
+[profile.dev]
+split-debuginfo = "unpacked"
+
+[profile.release]
+panic = "unwind"
+
 # The list of dependencies below (which can be both direct and indirect dependencies) are crates
 # that are suspected to be CPU-intensive, and that are unlikely to require debugging (as some of
 # their debug info might be missing) or to require to be frequently recompiled. We compile these
@@ -81,10 +89,6 @@ x25519-dalek = { opt-level = 3 }
 yamux = { opt-level = 3 }
 zeroize = { opt-level = 3 }
 
-[profile.release]
-panic = "unwind"
-incremental = true
-
 [patch.crates-io]
 node-inspect = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" }
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" }
diff --git a/integration-tests/src/kusama_cross_chain_transfer.rs b/integration-tests/src/kusama_cross_chain_transfer.rs
index b16d4f192..367ee29a7 100644
--- a/integration-tests/src/kusama_cross_chain_transfer.rs
+++ b/integration-tests/src/kusama_cross_chain_transfer.rs
@@ -36,7 +36,6 @@ fn transfer_from_relay_chain() {
 			)),
 			Box::new(VersionedMultiAssets::V1((Here, DOLLARS).into())),
 			0,
-			600_000_000
 		));
 	});
 
diff --git a/runtime/asgard/src/lib.rs b/runtime/asgard/src/lib.rs
index b275e36f3..73e19eefd 100644
--- a/runtime/asgard/src/lib.rs
+++ b/runtime/asgard/src/lib.rs
@@ -896,7 +896,7 @@ impl cumulus_pallet_xcm::Config for Runtime {
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type ChannelInfo = ParachainSystem;
 	type Event = Event;
-	type VersionWrapper = ();
+	type VersionWrapper = PolkadotXcm;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 }
 
diff --git a/runtime/bifrost/src/lib.rs b/runtime/bifrost/src/lib.rs
index 1bd4400c9..ef62d3b68 100644
--- a/runtime/bifrost/src/lib.rs
+++ b/runtime/bifrost/src/lib.rs
@@ -805,7 +805,7 @@ impl cumulus_pallet_xcm::Config for Runtime {
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type ChannelInfo = ParachainSystem;
 	type Event = Event;
-	type VersionWrapper = ();
+	type VersionWrapper = PolkadotXcm;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 }