Merge pull request #42 from Snowfork/alistair/main-fixes-after-update

Minor fixes for Penpal
Snowfork · Nov 27, 2023 · 6d1d270 · 6d1d270
2 parents c0ca774 + 356ccaf
commit 6d1d270
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/...rachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/src/lib.rs b/...rachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/src/lib.rs
@@ -38,6 +38,7 @@ decl_test_parachains! {
 			XcmpMessageHandler: asset_hub_westend_runtime::XcmpQueue,
 			LocationToAccountId: asset_hub_westend_runtime::xcm_config::LocationToAccountId,
 			ParachainInfo: asset_hub_westend_runtime::ParachainInfo,
+			MessageOrigin: cumulus_primitives_core::AggregateMessageOrigin,
 		},
 		pallets = {
 			PolkadotXcm: asset_hub_westend_runtime::PolkadotXcm,

diff --git a/...chains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/src/lib.rs b/...chains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/src/lib.rs
@@ -36,6 +36,7 @@ decl_test_parachains! {
 			XcmpMessageHandler: bridge_hub_westend_runtime::XcmpQueue,
 			LocationToAccountId: bridge_hub_westend_runtime::xcm_config::LocationToAccountId,
 			ParachainInfo: bridge_hub_westend_runtime::ParachainInfo,
+			MessageOrigin: cumulus_primitives_core::AggregateMessageOrigin,
 		},
 		pallets = {
 			PolkadotXcm: bridge_hub_westend_runtime::PolkadotXcm,

diff --git a/cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system/Cargo.toml b/cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system/Cargo.toml
@@ -16,3 +16,4 @@ asset-hub-rococo-emulated-chain = { path = "../../chains/parachains/assets/asset
 asset-hub-westend-emulated-chain = { path = "../../chains/parachains/assets/asset-hub-westend" }
 bridge-hub-rococo-emulated-chain = { path = "../../chains/parachains/bridges/bridge-hub-rococo" }
 bridge-hub-westend-emulated-chain = { path = "../../chains/parachains/bridges/bridge-hub-westend" }
+penpal-emulated-chain = { path = "../../chains/parachains/testing/penpal" }
diff --git a/cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system/src/lib.rs b/cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system/src/lib.rs
@@ -17,13 +17,15 @@ pub use asset_hub_rococo_emulated_chain;
 pub use asset_hub_westend_emulated_chain;
 pub use bridge_hub_rococo_emulated_chain;
 pub use bridge_hub_westend_emulated_chain;
+pub use penpal_emulated_chain;
 pub use rococo_emulated_chain;
 pub use westend_emulated_chain;
 
 use asset_hub_rococo_emulated_chain::AssetHubRococo;
 use asset_hub_westend_emulated_chain::AssetHubWestend;
 use bridge_hub_rococo_emulated_chain::BridgeHubRococo;
 use bridge_hub_westend_emulated_chain::BridgeHubWestend;
+use penpal_emulated_chain::PenpalA;
 use rococo_emulated_chain::Rococo;
 use westend_emulated_chain::Westend;
 
@@ -43,6 +45,7 @@ decl_test_networks! {
 		parachains = vec![
 			AssetHubRococo,
 			BridgeHubRococo,
+			PenpalA,
 		],
 		bridge = RococoWestendMockBridge
 
@@ -92,5 +95,6 @@ decl_test_sender_receiver_accounts_parameter_types! {
 	BridgeHubRococoPara { sender: ALICE, receiver: BOB },
 	WestendRelay { sender: ALICE, receiver: BOB },
 	AssetHubWestendPara { sender: ALICE, receiver: BOB },
-	BridgeHubWestendPara { sender: ALICE, receiver: BOB }
+	BridgeHubWestendPara { sender: ALICE, receiver: BOB },
+	PenpalAPara { sender: ALICE, receiver: BOB }
 }