Skip to content

Commit 39f471b

Browse files
authored
Merge branch 'master' into add-dev-chain-spec
2 parents b5f28c4 + 2345eb9 commit 39f471b

File tree

9 files changed

+663
-18
lines changed

9 files changed

+663
-18
lines changed

.gitlab/pipeline/zombienet.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.zombienet-refs:
22
extends: .build-refs
33
variables:
4-
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.116"
4+
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.119"
55
PUSHGATEWAY_URL: "http://zombienet-prometheus-pushgateway.managed-monitoring:9091/metrics/job/zombie-metrics"
66
DEBUG: "zombie,zombie::network-node,zombie::kube::client::logs"
77
ZOMBIE_PROVIDER: "k8s"

Cargo.lock

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ pub mod genesis;
1818
pub use bridge_hub_westend_runtime::{
1919
self, xcm_config::XcmConfig as BridgeHubWestendXcmConfig,
2020
ExistentialDeposit as BridgeHubWestendExistentialDeposit,
21+
RuntimeOrigin as BridgeHubWestendRuntimeOrigin,
2122
};
2223

2324
// Substrate
@@ -47,6 +48,8 @@ decl_test_parachains! {
4748
PolkadotXcm: bridge_hub_westend_runtime::PolkadotXcm,
4849
Balances: bridge_hub_westend_runtime::Balances,
4950
EthereumSystem: bridge_hub_westend_runtime::EthereumSystem,
51+
EthereumInboundQueue: bridge_hub_westend_runtime::EthereumInboundQueue,
52+
EthereumOutboundQueue: bridge_hub_westend_runtime::EthereumOutboundQueue,
5053
}
5154
},
5255
}

cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/lib.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,11 @@ mod imports {
5151
},
5252
bridge_hub_westend_emulated_chain::{
5353
genesis::ED as BRIDGE_HUB_WESTEND_ED, BridgeHubWestendExistentialDeposit,
54-
BridgeHubWestendParaPallet as BridgeHubWestendPallet, BridgeHubWestendXcmConfig,
54+
BridgeHubWestendParaPallet as BridgeHubWestendPallet, BridgeHubWestendRuntimeOrigin,
55+
BridgeHubWestendXcmConfig,
5556
},
5657
penpal_emulated_chain::{
58+
self,
5759
penpal_runtime::xcm_config::{
5860
CustomizableAssetFromSystemAssetHub as PenpalCustomizableAssetFromSystemAssetHub,
5961
LocalTeleportableToAssetHub as PenpalLocalTeleportableToAssetHub,

0 commit comments

Comments
 (0)