diff --git a/Cargo.lock b/Cargo.lock index e2a99a77..5036df4d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11918,7 +11918,6 @@ dependencies = [ "pezframe-support", "pezframe-support-procedural", "pezframe-system", - "pezsc-client-db", "pezsp-api", "pezsp-application-crypto", "pezsp-core", @@ -12141,7 +12140,6 @@ dependencies = [ "paste", "pez-binary-merkle-tree", "pezframe-support-procedural", - "pezframe-system", "pezsp-api", "pezsp-arithmetic", "pezsp-core", @@ -12156,7 +12154,6 @@ dependencies = [ "pezsp-staking", "pezsp-state-machine", "pezsp-std", - "pezsp-timestamp", "pezsp-tracing", "pezsp-trie", "pezsp-weights", @@ -12178,21 +12175,13 @@ dependencies = [ "expander", "itertools 0.11.0", "macro_magic", - "parity-scale-codec", - "pezframe-benchmarking", - "pezframe-support", "pezframe-support-procedural-tools", - "pezframe-system", "pezsp-crypto-hashing", - "pezsp-io", - "pezsp-metadata-ir", - "pezsp-runtime", "pretty_assertions", "proc-macro-warning", "proc-macro2 1.0.103", "quote 1.0.42", "regex", - "scale-info", "syn 2.0.111", ] @@ -12281,7 +12270,6 @@ dependencies = [ name = "pezframe-system" version = "28.0.0" dependencies = [ - "bizinikiwi-test-runtime-client", "cfg-if", "criterion", "docify", diff --git a/bizinikiwi/pezframe/benchmarking/Cargo.toml b/bizinikiwi/pezframe/benchmarking/Cargo.toml index 8bf84b42..fdae94f1 100644 --- a/bizinikiwi/pezframe/benchmarking/Cargo.toml +++ b/bizinikiwi/pezframe/benchmarking/Cargo.toml @@ -35,9 +35,9 @@ scale-info = { features = ["derive"], workspace = true } serde = { optional = true, workspace = true, default-features = true } static_assertions = { workspace = true, default-features = true } +# Dev-dependencies with pezsc-client-db moved to integration tests to break circular dependency [dev-dependencies] array-bytes = { workspace = true, default-features = true } -pezsc-client-db = { workspace = true } pezsp-externalities = { workspace = true } pezsp-keystore = { workspace = true, default-features = true } pezsp-state-machine = { workspace = true } @@ -69,7 +69,6 @@ runtime-benchmarks = [ "pezframe-support-procedural/runtime-benchmarks", "pezframe-support/runtime-benchmarks", "pezframe-system/runtime-benchmarks", - "pezsc-client-db/runtime-benchmarks", "pezsp-api/runtime-benchmarks", "pezsp-io/runtime-benchmarks", "pezsp-runtime-interface/runtime-benchmarks", diff --git a/bizinikiwi/pezframe/support/Cargo.toml b/bizinikiwi/pezframe/support/Cargo.toml index 4c29254e..a171d2e9 100644 --- a/bizinikiwi/pezframe/support/Cargo.toml +++ b/bizinikiwi/pezframe/support/Cargo.toml @@ -53,11 +53,10 @@ tt-call = { workspace = true } aquamarine = { workspace = true } +# Dev-dependencies with pezframe-system moved to pezframe-support-test to break circular dependency [dev-dependencies] Inflector = { workspace = true } -pezframe-system = { workspace = true, default-features = true } pezsp-crypto-hashing = { workspace = true, default-features = true } -pezsp-timestamp = { workspace = true, default-features = true } pretty_assertions = { workspace = true } [features] @@ -70,7 +69,6 @@ std = [ "k256/std", "log/std", "pezframe-support-procedural/std", - "pezframe-system/std", "pezsp-api/std", "pezsp-arithmetic/std", "pezsp-core/std", @@ -93,7 +91,6 @@ std = [ runtime-benchmarks = [ "pez-binary-merkle-tree/runtime-benchmarks", "pezframe-support-procedural/runtime-benchmarks", - "pezframe-system/runtime-benchmarks", "pezsp-api/runtime-benchmarks", "pezsp-genesis-builder/runtime-benchmarks", "pezsp-inherents/runtime-benchmarks", @@ -101,11 +98,9 @@ runtime-benchmarks = [ "pezsp-runtime/runtime-benchmarks", "pezsp-staking/runtime-benchmarks", "pezsp-state-machine?/runtime-benchmarks", - "pezsp-timestamp/runtime-benchmarks", "pezsp-trie/runtime-benchmarks", ] try-runtime = [ - "pezframe-system/try-runtime", "pezsp-debug-derive/force-debug", "pezsp-runtime/try-runtime", ] diff --git a/bizinikiwi/pezframe/support/procedural/Cargo.toml b/bizinikiwi/pezframe/support/procedural/Cargo.toml index 054d6e84..1b32b275 100644 --- a/bizinikiwi/pezframe/support/procedural/Cargo.toml +++ b/bizinikiwi/pezframe/support/procedural/Cargo.toml @@ -18,8 +18,10 @@ targets = ["x86_64-unknown-linux-gnu"] [lib] proc-macro = true -[[example]] -name = "proc_main" +# Example requires pezframe-support/pezframe-system which creates circular dependency +# Tests moved to pezframe-support-test crate +# [[example]] +# name = "proc_main" [dependencies] Inflector = { workspace = true } @@ -36,36 +38,16 @@ proc-macro2 = { workspace = true } quote = { workspace = true } syn = { features = ["full", "parsing", "visit-mut"], workspace = true } +# Dev-dependencies moved to pezframe-support-test to break circular dependency for crates.io publish +# Tests that need pezframe-benchmarking, pezframe-support, pezframe-system should use integration tests [dev-dependencies] -codec = { features = [ - "derive", - "max-encoded-len", -], workspace = true, default-features = true } -pezframe-benchmarking = { workspace = true, default-features = true } -pezframe-support = { workspace = true, default-features = true } -pezframe-system = { workspace = true, default-features = true } -pezsp-io = { workspace = true, default-features = true } -pezsp-metadata-ir = { workspace = true, default-features = true } -pezsp-runtime = { features = [ - "serde", -], workspace = true, default-features = true } pretty_assertions = { workspace = true } regex = { workspace = true } -scale-info = { features = [ - "derive", -], workspace = true, default-features = true } [features] default = ["std"] std = [ - "codec/std", - "pezframe-benchmarking/std", - "pezframe-support/std", - "pezframe-system/std", "pezsp-crypto-hashing/std", - "pezsp-metadata-ir/std", - "pezsp-runtime/std", - "scale-info/std", ] no-metadata-docs = [] experimental = [] @@ -73,10 +55,4 @@ experimental = [] # pallets in a runtime grows. Does increase the compile time! tuples-96 = [] tuples-128 = [] -runtime-benchmarks = [ - "pezframe-benchmarking/runtime-benchmarks", - "pezframe-support/runtime-benchmarks", - "pezframe-system/runtime-benchmarks", - "pezsp-io/runtime-benchmarks", - "pezsp-runtime/runtime-benchmarks", -] +runtime-benchmarks = [] diff --git a/bizinikiwi/pezframe/system/Cargo.toml b/bizinikiwi/pezframe/system/Cargo.toml index 6f8fb26f..5cdb75d5 100644 --- a/bizinikiwi/pezframe/system/Cargo.toml +++ b/bizinikiwi/pezframe/system/Cargo.toml @@ -34,8 +34,8 @@ pezsp-weights = { features = ["serde"], workspace = true } scale-info = { features = ["derive", "serde"], workspace = true } serde = { features = ["alloc", "derive"], workspace = true } +# Dev-dependencies with test-runtime-client moved to integration tests to break circular dependency [dev-dependencies] -bizinikiwi-test-runtime-client = { workspace = true } criterion = { workspace = true, default-features = true } pezsp-externalities = { workspace = true, default-features = true } pezsp-tracing = { workspace = true, default-features = true } @@ -55,7 +55,6 @@ std = [ "serde/std", ] runtime-benchmarks = [ - "bizinikiwi-test-runtime-client/runtime-benchmarks", "pezframe-support/runtime-benchmarks", "pezsp-io/runtime-benchmarks", "pezsp-runtime/runtime-benchmarks",