From 1314a185ccad9bac7360b018af15e7ab573b711d Mon Sep 17 00:00:00 2001
From: ron <yrong1997@gmail.com>
Date: Fri, 6 Sep 2024 22:03:46 +0800
Subject: [PATCH] Cleanup

---
 bridges/snowbridge/pallets/system/src/mock.rs |  1 -
 .../src/tests/snowbridge.rs                   |  3 +-
 .../bridge-hub-westend/tests/snowbridge.rs    | 58 ++-----------------
 3 files changed, 6 insertions(+), 56 deletions(-)

diff --git a/bridges/snowbridge/pallets/system/src/mock.rs b/bridges/snowbridge/pallets/system/src/mock.rs
index fba437882192..217b7efda4ee 100644
--- a/bridges/snowbridge/pallets/system/src/mock.rs
+++ b/bridges/snowbridge/pallets/system/src/mock.rs
@@ -190,7 +190,6 @@ parameter_types! {
 		multiplier: FixedU128::from_rational(4, 3)
 	};
 	pub const InboundDeliveryCost: u128 = 1_000_000_000;
-	pub const EnableRegisterToken: bool = false;
 }
 
 #[cfg(feature = "runtime-benchmarks")]
diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/snowbridge.rs b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/snowbridge.rs
index 7bfcc00bb34c..389b3ec33427 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/snowbridge.rs
+++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/snowbridge.rs
@@ -14,7 +14,7 @@
 // limitations under the License.
 use crate::imports::*;
 use asset_hub_westend_runtime::xcm_config::bridging::to_ethereum::DefaultBridgeHubEthereumBaseFee;
-use bridge_hub_westend_runtime::{xcm_config::TreasuryAccount, EthereumInboundQueue};
+use bridge_hub_westend_runtime::EthereumInboundQueue;
 use codec::{Decode, Encode};
 use emulated_integration_tests_common::{
 	PenpalBSiblingSovereignAccount, RESERVABLE_ASSET_ID, TELEPORTABLE_ASSET_ID,
@@ -294,7 +294,6 @@ fn transfer_relay_token() {
 		BridgeHubWestend::sibling_location_of(AssetHubWestend::para_id()),
 	);
 	BridgeHubWestend::fund_accounts(vec![(assethub_sovereign.clone(), INITIAL_FUND)]);
-	BridgeHubWestend::fund_accounts(vec![(TreasuryAccount::get(), INITIAL_FUND * 10)]);
 
 	let asset_id: Location = Location { parents: 1, interior: [].into() };
 	let expected_asset_id: Location =
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/tests/snowbridge.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/tests/snowbridge.rs
index 2f64c75114d5..c5f3871c0790 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/tests/snowbridge.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/tests/snowbridge.rs
@@ -19,30 +19,22 @@
 use bp_asset_hub_westend::ASSET_HUB_WESTEND_PARACHAIN_ID;
 use bp_bridge_hub_westend::BRIDGE_HUB_WESTEND_PARACHAIN_ID;
 use bp_polkadot_core::Signature;
-use bridge_hub_test_utils::{ExtBuilder, RuntimeHelper};
 use bridge_hub_westend_runtime::{
-	bridge_to_ethereum_config::EnableRegisterToken, bridge_to_rococo_config, xcm_config::XcmConfig,
-	AllPalletsWithoutSystem, BridgeRejectObsoleteHeadersAndMessages, Executive,
-	MessageQueueServiceWeight, Runtime, RuntimeCall, RuntimeEvent, SessionKeys, SignedExtra,
-	UncheckedExtrinsic,
+	bridge_to_rococo_config, xcm_config::XcmConfig, AllPalletsWithoutSystem,
+	BridgeRejectObsoleteHeadersAndMessages, Executive, MessageQueueServiceWeight, Runtime,
+	RuntimeCall, RuntimeEvent, SessionKeys, SignedExtra, UncheckedExtrinsic,
 };
 use codec::{Decode, Encode};
 use cumulus_primitives_core::XcmError::{FailedToTransactAsset, NotHoldingFees};
-use frame_support::{assert_err, assert_ok, parameter_types};
+use frame_support::parameter_types;
 use parachains_common::{AccountId, AuraId, Balance};
-use snowbridge_core::{outbound::SendError, AssetMetadata};
 use snowbridge_pallet_ethereum_client::WeightInfo;
 use sp_core::H160;
-use sp_keyring::AccountKeyring::{Alice, Ferdie};
+use sp_keyring::AccountKeyring::Alice;
 use sp_runtime::{
 	generic::{Era, SignedPayload},
-	traits::BadOrigin,
 	AccountId32,
 };
-use xcm::{
-	prelude::{GlobalConsensus, Location, Westend},
-	VersionedLocation,
-};
 
 parameter_types! {
 		pub const DefaultBridgeHubEthereumBaseFee: Balance = 2_750_872_500_000;
@@ -208,43 +200,3 @@ fn construct_and_apply_extrinsic(
 	let r = Executive::apply_extrinsic(xt);
 	r.unwrap()
 }
-
-#[test]
-fn enable_register_token_flag_works() {
-	ExtBuilder::<Runtime>::default()
-		.with_collators(collator_session_keys().collators())
-		.with_session_keys(collator_session_keys().session_keys())
-		.with_para_id(BRIDGE_HUB_WESTEND_PARACHAIN_ID.into())
-		.with_tracing()
-		.build()
-		.execute_with(|| {
-			let location: VersionedLocation =
-				VersionedLocation::from(Location::new(1, [GlobalConsensus(Westend)]));
-			let metadata: AssetMetadata = AssetMetadata {
-				name: "wnd".as_bytes().to_vec().try_into().unwrap(),
-				symbol: "wnd".as_bytes().to_vec().try_into().unwrap(),
-				decimals: 12,
-			};
-			assert_err!(
-				<snowbridge_pallet_system::Pallet<Runtime>>::register_token(
-					RuntimeHelper::<Runtime, AllPalletsWithoutSystem>::origin_of(Ferdie.into()),
-					Box::new(location.clone()),
-					metadata.clone(),
-				),
-				BadOrigin
-			);
-			assert_ok!(<frame_system::Pallet<Runtime>>::set_storage(
-				RuntimeHelper::<Runtime, AllPalletsWithoutSystem>::root_origin(),
-				vec![(EnableRegisterToken::key().to_vec(), true.encode())],
-			));
-			// Send error here means the origin check is passed and register token is enabled
-			assert_err!(
-				<snowbridge_pallet_system::Pallet<Runtime>>::register_token(
-					RuntimeHelper::<Runtime, AllPalletsWithoutSystem>::origin_of(Ferdie.into()),
-					Box::new(location.clone()),
-					metadata.clone(),
-				),
-				<snowbridge_pallet_system::Error<Runtime>>::Send(SendError::InvalidChannel)
-			);
-		});
-}