From a667be1022ed720d20a77b1275b439d80f637801 Mon Sep 17 00:00:00 2001 From: claravanstaden Date: Wed, 22 Nov 2023 21:02:07 +0200 Subject: [PATCH] fmt --- Cargo.lock | 7 +++++-- .../tests/bridges/bridge-hub-rococo/src/lib.rs | 7 ++++--- .../runtimes/testing/penpal/src/xcm_config.rs | 10 ++++------ 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5cf2637def83..eaab8d6d3023 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2311,13 +2311,17 @@ dependencies = [ name = "bridge-hub-rococo-integration-tests" version = "1.0.0" dependencies = [ + "asset-hub-rococo-emulated-chain", "asset-test-utils", "bp-messages", + "bridge-hub-rococo-emulated-chain", "bridge-hub-rococo-runtime", "cumulus-pallet-dmp-queue", "cumulus-pallet-xcmp-queue", "emulated-integration-tests-common", "frame-support", + "hex", + "hex-literal", "pallet-assets", "pallet-balances", "pallet-bridge-messages", @@ -2326,6 +2330,7 @@ dependencies = [ "parachains-common", "parity-scale-codec", "penpal-emulated-chain", + "rococo-westend-system-emulated-network", "scale-info", "snowbridge-control", "snowbridge-core", @@ -2333,7 +2338,6 @@ dependencies = [ "snowbridge-outbound-queue", "snowbridge-router-primitives", "sp-core", - "rococo-westend-system-emulated-network", "staging-xcm", "staging-xcm-executor", ] @@ -14998,7 +15002,6 @@ dependencies = [ "bridge-hub-rococo-emulated-chain", "bridge-hub-westend-emulated-chain", "emulated-integration-tests-common", - "penpal-emulated-chain", "rococo-emulated-chain", "westend-emulated-chain", ] diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/lib.rs index 58c7af3626da..86cf8e68d40d 100644 --- a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/lib.rs +++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/lib.rs @@ -56,10 +56,11 @@ pub use rococo_westend_system_emulated_network::{ AssetHubRococoPara as AssetHubRococo, AssetHubRococoParaReceiver as AssetHubRococoReceiver, AssetHubRococoParaSender as AssetHubRococoSender, AssetHubWestendPara as AssetHubWestend, AssetHubWestendParaReceiver as AssetHubWestendReceiver, BridgeHubRococoPara as BridgeHubRococo, - BridgeHubRococoParaSender as BridgeHubRococoSender, BridgeHubWestendPara as BridgeHubWestend, BridgeHubRococoParaReceiver as BridgeHubRococoReceiver, - PenpalAPara as PenpalA, PenpalAParaSender as PenpalASender, PenpalAParaReceiver as PenpalAReceiver, - RococoRelay as Rococo, RococoRelayReceiver as RococoReceiver, RococoRelaySender as RococoSender, + BridgeHubRococoParaSender as BridgeHubRococoSender, BridgeHubWestendPara as BridgeHubWestend, + PenpalAPara as PenpalA, PenpalAParaReceiver as PenpalAReceiver, + PenpalAParaSender as PenpalASender, RococoRelay as Rococo, + RococoRelayReceiver as RococoReceiver, RococoRelaySender as RococoSender, }; pub const ASSET_ID: u32 = 1; diff --git a/cumulus/parachains/runtimes/testing/penpal/src/xcm_config.rs b/cumulus/parachains/runtimes/testing/penpal/src/xcm_config.rs index 39064eede9ba..292ea3a10019 100644 --- a/cumulus/parachains/runtimes/testing/penpal/src/xcm_config.rs +++ b/cumulus/parachains/runtimes/testing/penpal/src/xcm_config.rs @@ -112,10 +112,8 @@ pub type FungiblesTransactor = FungiblesAdapter< >; /// `AssetId/Balance` converter for `TrustBackedAssets` -pub type ForeignAssetsConvertedConcreteId = assets_common::ForeignAssetsConvertedConcreteId< - StartsWith, - Balance, ->; +pub type ForeignAssetsConvertedConcreteId = + assets_common::ForeignAssetsConvertedConcreteId, Balance>; /// Means for transacting foreign assets from different global consensus. pub type ForeignFungiblesTransactor = FungiblesAdapter< @@ -211,8 +209,8 @@ pub type AccountIdOf = ::AccountId; /// Asset filter that allows all assets from a certain location matching asset id. pub struct AssetPrefixFrom(PhantomData<(Prefix, Origin)>); -impl ContainsPair for AssetPrefixFrom -where +impl ContainsPair for AssetPrefixFrom +where Prefix: Get, Origin: Get, {