Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/bko-bump-to-1.6' into bko-bump-t…
Browse files Browse the repository at this point in the history
…o-1.6-encointer
  • Loading branch information
bkontur committed Feb 26, 2024
2 parents 3a88996 + 06cd27b commit 12fd695
Show file tree
Hide file tree
Showing 74 changed files with 7,681 additions and 3,862 deletions.
4,987 changes: 3,957 additions & 1,030 deletions Cargo.lock

Large diffs are not rendered by default.

20 changes: 16 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,22 @@ members = [
"system-parachains/constants",
"system-parachains/encointer",
"system-parachains/gluttons/glutton-kusama",
"integration-tests/emulated/assets/asset-hub-kusama",
"integration-tests/emulated/assets/asset-hub-polkadot",
"integration-tests/emulated/chains",
"integration-tests/emulated/common",
"integration-tests/emulated/chains/relays/kusama",
"integration-tests/emulated/chains/relays/polkadot",
"integration-tests/emulated/chains/parachains/assets/asset-hub-kusama",
"integration-tests/emulated/chains/parachains/assets/asset-hub-polkadot",
"integration-tests/emulated/chains/parachains/bridges/bridge-hub-kusama",
"integration-tests/emulated/chains/parachains/bridges/bridge-hub-polkadot",
"integration-tests/emulated/chains/parachains/collectives/collectives-polkadot",
"integration-tests/emulated/chains/parachains/testing/penpal",
"integration-tests/emulated/helpers",
"integration-tests/emulated/networks/kusama-system",
"integration-tests/emulated/networks/polkadot-system",
"integration-tests/emulated/networks/kusama-polkadot-system",
"integration-tests/emulated/tests/assets/asset-hub-kusama",
"integration-tests/emulated/tests/assets/asset-hub-polkadot",
"integration-tests/emulated/tests/bridges/bridge-hub-kusama",
"integration-tests/emulated/tests/bridges/bridge-hub-polkadot",
]

[profile.release]
Expand Down
107 changes: 0 additions & 107 deletions integration-tests/emulated/assets/asset-hub-kusama/src/lib.rs

This file was deleted.

35 changes: 0 additions & 35 deletions integration-tests/emulated/assets/asset-hub-polkadot/Cargo.toml

This file was deleted.

107 changes: 0 additions & 107 deletions integration-tests/emulated/assets/asset-hub-polkadot/src/lib.rs

This file was deleted.

44 changes: 0 additions & 44 deletions integration-tests/emulated/chains/Cargo.toml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[package]
name = "asset-hub-kusama-emulated-chain"
version = "0.0.0"
authors.workspace = true
edition.workspace = true
license = "Apache-2.0"
description = "Asset Hub Kusama emulated chain used for integration tests"
publish = false

[dependencies]
serde_json = "1.0.111"

# Substrate
sp-core = { version = "28.0.0" }
sp-runtime = { version = "31.0.1" }
frame-support = { version = "28.0.0" }

# Cumulus
parachains-common = { version = "7.0.0" }
cumulus-primitives-core = { version = "0.7.0" }
emulated-integration-tests-common = { version = "3.0.0" }

# Runtimes
asset-hub-kusama-runtime = { path = "../../../../../../system-parachains/asset-hubs/asset-hub-kusama" }
kusama-emulated-chain = { path = "../../../relays/kusama" }
system-parachains-constants = { path = "../../../../../../system-parachains/constants" }
Loading

0 comments on commit 12fd695

Please sign in to comment.