merge master and fix conflict

AcalaNetwork · shaunxw · Jun 16, 2022 · Jun 7, 2022 · Jun 8, 2022 · Jun 8, 2022
commit 16f582f9fffbbda13fdcbcccad4296e3df06dfed
diff --git a/modules/asset-registry/Cargo.toml b/modules/asset-registry/Cargo.toml
@@ -16,8 +16,6 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "polk
 primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
 
 xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false }
 
 module-support = { path = "../support", default-features = false }
 

diff --git a/modules/transaction-payment/Cargo.toml b/modules/transaction-payment/Cargo.toml
@@ -20,8 +20,6 @@ support = { package = "module-support", path = "../support", default-features =
 
 orml-traits = { path = "../../orml/traits", default-features = false }
 xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.23", default-features = false }
 
 [dev-dependencies]
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.23" }

diff --git a/modules/transaction-payment/src/lib.rs b/modules/transaction-payment/src/lib.rs
@@ -36,7 +36,7 @@ use frame_support::{
 		WithdrawReasons,
 	},
 	transactional,
-	weights::{constants::WEIGHT_PER_SECOND, DispatchInfo, GetDispatchInfo, Pays, PostDispatchInfo, WeightToFee},
+	weights::{DispatchInfo, GetDispatchInfo, Pays, PostDispatchInfo, WeightToFee},
 	BoundedVec, PalletId,
 };
 use frame_system::pallet_prelude::*;

diff --git a/modules/transaction-payment/src/tests.rs b/modules/transaction-payment/src/tests.rs
@@ -505,7 +505,7 @@ fn charges_fee_when_validate_with_fee_path_call() {
 	// Enable dex with Alice, and initialize tx charge fee pool
 	builder_with_dex_and_fee_pool(true).execute_with(|| {
 		let dex_acc: AccountId = PalletId(*b"aca/dexm").into_account_truncating();
-		let dex_ausd = Currencies::free_balance(ACA, &dex_acc);
+		let dex_aca = Currencies::free_balance(ACA, &dex_acc);
 
 		let fee: Balance = 50 * 2 + 100 + 10;
 		let fee_surplus = fee + CustomFeeSurplus::get().mul_ceil(fee);