Skip to content

Commit

Permalink
Merge branch 'master' into tife-consumer-removal
Browse files Browse the repository at this point in the history
  • Loading branch information
tifecool authored Jan 22, 2025
2 parents 98dffba + 2345eb9 commit ac7a686
Show file tree
Hide file tree
Showing 9 changed files with 663 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .gitlab/pipeline/zombienet.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.zombienet-refs:
extends: .build-refs
variables:
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.116"
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.119"
PUSHGATEWAY_URL: "http://zombienet-prometheus-pushgateway.managed-monitoring:9091/metrics/job/zombie-metrics"
DEBUG: "zombie,zombie::network-node,zombie::kube::client::logs"
ZOMBIE_PROVIDER: "k8s"
Expand Down
3 changes: 1 addition & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ pub mod genesis;
pub use bridge_hub_westend_runtime::{
self, xcm_config::XcmConfig as BridgeHubWestendXcmConfig,
ExistentialDeposit as BridgeHubWestendExistentialDeposit,
RuntimeOrigin as BridgeHubWestendRuntimeOrigin,
};

// Substrate
Expand Down Expand Up @@ -47,6 +48,8 @@ decl_test_parachains! {
PolkadotXcm: bridge_hub_westend_runtime::PolkadotXcm,
Balances: bridge_hub_westend_runtime::Balances,
EthereumSystem: bridge_hub_westend_runtime::EthereumSystem,
EthereumInboundQueue: bridge_hub_westend_runtime::EthereumInboundQueue,
EthereumOutboundQueue: bridge_hub_westend_runtime::EthereumOutboundQueue,
}
},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,11 @@ mod imports {
},
bridge_hub_westend_emulated_chain::{
genesis::ED as BRIDGE_HUB_WESTEND_ED, BridgeHubWestendExistentialDeposit,
BridgeHubWestendParaPallet as BridgeHubWestendPallet, BridgeHubWestendXcmConfig,
BridgeHubWestendParaPallet as BridgeHubWestendPallet, BridgeHubWestendRuntimeOrigin,
BridgeHubWestendXcmConfig,
},
penpal_emulated_chain::{
self,
penpal_runtime::xcm_config::{
CustomizableAssetFromSystemAssetHub as PenpalCustomizableAssetFromSystemAssetHub,
LocalTeleportableToAssetHub as PenpalLocalTeleportableToAssetHub,
Expand Down
Loading

0 comments on commit ac7a686

Please sign in to comment.