diff --git a/Cargo.lock b/Cargo.lock index 9766caba..9522a5c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5658,9 +5658,7 @@ dependencies = [ name = "frame-storage-access-test-runtime" version = "0.1.0" dependencies = [ - "bizinikiwi-wasm-builder", "parity-scale-codec", - "pezcumulus-pezpallet-teyrchain-system", "pezsp-core", "pezsp-runtime", "pezsp-state-machine", @@ -11945,7 +11943,6 @@ dependencies = [ "clap", "comfy-table", "env_filter", - "frame-storage-access-test-runtime", "gethostname", "handlebars", "itertools 0.11.0", @@ -15489,7 +15486,6 @@ dependencies = [ "pezframe-benchmarking", "pezframe-support", "pezframe-system", - "pezpallet-transaction-payment", "pezsp-core", "pezsp-io", "pezsp-runtime", @@ -18132,7 +18128,6 @@ dependencies = [ "pezframe-system", "pezpallet-balances", "pezpallet-collective", - "pezpallet-root-testing", "pezpallet-timestamp", "pezsp-core", "pezsp-io", diff --git a/bizinikiwi/pezframe/balances/Cargo.toml b/bizinikiwi/pezframe/balances/Cargo.toml index d5359ba6..0a93cae8 100644 --- a/bizinikiwi/pezframe/balances/Cargo.toml +++ b/bizinikiwi/pezframe/balances/Cargo.toml @@ -27,12 +27,12 @@ pezsp-core = { workspace = true } pezsp-runtime = { workspace = true } scale-info = { features = ["derive"], workspace = true } +# pezpallet-transaction-payment moved to integration tests to break circular dependency [dev-dependencies] paste = { workspace = true, default-features = true } pezframe-support = { features = [ "experimental", ], workspace = true, default-features = true } -pezpallet-transaction-payment = { workspace = true, default-features = true } pezsp-io = { workspace = true, default-features = true } [features] @@ -43,7 +43,6 @@ std = [ "pezframe-benchmarking?/std", "pezframe-support/std", "pezframe-system/std", - "pezpallet-transaction-payment/std", "pezsp-core/std", "pezsp-io/std", "pezsp-runtime/std", @@ -55,13 +54,11 @@ runtime-benchmarks = [ "pezframe-benchmarking/runtime-benchmarks", "pezframe-support/runtime-benchmarks", "pezframe-system/runtime-benchmarks", - "pezpallet-transaction-payment/runtime-benchmarks", "pezsp-io/runtime-benchmarks", "pezsp-runtime/runtime-benchmarks", ] try-runtime = [ "pezframe-support/try-runtime", "pezframe-system/try-runtime", - "pezpallet-transaction-payment/try-runtime", "pezsp-runtime/try-runtime", ] diff --git a/bizinikiwi/pezframe/utility/Cargo.toml b/bizinikiwi/pezframe/utility/Cargo.toml index 976c52d8..e8e8099c 100644 --- a/bizinikiwi/pezframe/utility/Cargo.toml +++ b/bizinikiwi/pezframe/utility/Cargo.toml @@ -26,10 +26,10 @@ pezsp-io = { workspace = true } pezsp-runtime = { workspace = true } scale-info = { features = ["derive"], workspace = true } +# pezpallet-root-testing moved to integration tests to break circular dependency [dev-dependencies] pezpallet-balances = { workspace = true, default-features = true } pezpallet-collective = { workspace = true, default-features = true } -pezpallet-root-testing = { workspace = true, default-features = true } pezpallet-timestamp = { workspace = true, default-features = true } [features] @@ -50,7 +50,6 @@ runtime-benchmarks = [ "pezframe-system/runtime-benchmarks", "pezpallet-balances/runtime-benchmarks", "pezpallet-collective/runtime-benchmarks", - "pezpallet-root-testing/runtime-benchmarks", "pezpallet-timestamp/runtime-benchmarks", "pezsp-io/runtime-benchmarks", "pezsp-runtime/runtime-benchmarks", @@ -60,7 +59,6 @@ try-runtime = [ "pezframe-system/try-runtime", "pezpallet-balances/try-runtime", "pezpallet-collective/try-runtime", - "pezpallet-root-testing/try-runtime", "pezpallet-timestamp/try-runtime", "pezsp-runtime/try-runtime", ] diff --git a/bizinikiwi/utils/pezframe/benchmarking-cli/Cargo.toml b/bizinikiwi/utils/pezframe/benchmarking-cli/Cargo.toml index 092249b8..82e23e90 100644 --- a/bizinikiwi/utils/pezframe/benchmarking-cli/Cargo.toml +++ b/bizinikiwi/utils/pezframe/benchmarking-cli/Cargo.toml @@ -24,7 +24,7 @@ clap = { features = ["derive"], workspace = true } codec = { workspace = true, default-features = true } comfy-table = { workspace = true } env_filter = { workspace = true } -frame-storage-access-test-runtime = { workspace = true, default-features = true } +# frame-storage-access-test-runtime moved to integration tests to break circular dependency gethostname = { workspace = true } handlebars = { workspace = true } itertools = { workspace = true } @@ -89,7 +89,6 @@ zagros-runtime = { workspace = true, default-features = true } default = [] runtime-benchmarks = [ "bizinikiwi-test-runtime/runtime-benchmarks", - "frame-storage-access-test-runtime/runtime-benchmarks", "pezcumulus-client-teyrchain-inherent/runtime-benchmarks", "pezcumulus-primitives-proof-size-hostfunction/runtime-benchmarks", "pezcumulus-test-runtime/runtime-benchmarks", diff --git a/bizinikiwi/utils/pezframe/storage-access-test-runtime/Cargo.toml b/bizinikiwi/utils/pezframe/storage-access-test-runtime/Cargo.toml index 42baa970..8f607592 100644 --- a/bizinikiwi/utils/pezframe/storage-access-test-runtime/Cargo.toml +++ b/bizinikiwi/utils/pezframe/storage-access-test-runtime/Cargo.toml @@ -16,30 +16,26 @@ workspace = true [dependencies] codec = { features = ["derive"], workspace = true } -pezcumulus-pezpallet-teyrchain-system = { workspace = true, optional = true } +# pezcumulus-pezpallet-teyrchain-system moved to integration tests to break circular dependency pezsp-core = { workspace = true } pezsp-runtime = { workspace = true } pezsp-state-machine = { workspace = true } pezsp-trie = { workspace = true } +# bizinikiwi-wasm-builder moved to integration tests to break circular dependency [build-dependencies] -bizinikiwi-wasm-builder = { optional = true, workspace = true, default-features = true } [features] default = ["std"] no_std = [] std = [ - "bizinikiwi-wasm-builder", "codec/std", - "pezcumulus-pezpallet-teyrchain-system/std", "pezsp-core/std", "pezsp-runtime/std", "pezsp-state-machine/std", "pezsp-trie/std", ] runtime-benchmarks = [ - "bizinikiwi-wasm-builder?/runtime-benchmarks", - "pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks", "pezsp-runtime/runtime-benchmarks", "pezsp-state-machine/runtime-benchmarks", "pezsp-trie/runtime-benchmarks", diff --git a/bizinikiwi/utils/pezframe/storage-access-test-runtime/build.rs b/bizinikiwi/utils/pezframe/storage-access-test-runtime/build.rs index eaaae4d9..31d17c0c 100644 --- a/bizinikiwi/utils/pezframe/storage-access-test-runtime/build.rs +++ b/bizinikiwi/utils/pezframe/storage-access-test-runtime/build.rs @@ -15,14 +15,5 @@ // See the License for the specific language governing permissions and // limitations under the License. -fn main() { - #[cfg(feature = "std")] - { - bizinikiwi_wasm_builder::WasmBuilder::new() - .with_current_project() - .export_heap_base() - .import_memory() - .disable_runtime_version_section_check() - .build(); - } -} +// bizinikiwi-wasm-builder moved to integration tests to break circular dependency +fn main() {}