From 49e377649f44f6e171c46962501019a3d9e38249 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Wed, 11 Dec 2019 11:44:25 +0100 Subject: [PATCH 01/11] rename crate: sp-transaction-pool-api -> sp-transaction-pool --- .maintain/rename-crates-for-2.0.sh | 1 + Cargo.lock | 34 ++++++++++++------------ bin/node-template/Cargo.toml | 2 +- bin/node-template/runtime/Cargo.toml | 2 +- bin/node/cli/Cargo.toml | 2 +- bin/node/rpc/Cargo.toml | 2 +- bin/node/runtime/Cargo.toml | 2 +- client/api/Cargo.toml | 2 +- client/basic-authorship/Cargo.toml | 2 +- client/offchain/Cargo.toml | 2 +- client/rpc/Cargo.toml | 2 +- client/rpc/api/Cargo.toml | 2 +- client/service/Cargo.toml | 2 +- client/service/test/Cargo.toml | 2 +- client/transaction-pool/Cargo.toml | 2 +- client/transaction-pool/graph/Cargo.toml | 2 +- primitives/transaction-pool/Cargo.toml | 2 +- test/utils/runtime/Cargo.toml | 2 +- utils/frame/rpc/system/Cargo.toml | 2 +- 19 files changed, 35 insertions(+), 34 deletions(-) diff --git a/.maintain/rename-crates-for-2.0.sh b/.maintain/rename-crates-for-2.0.sh index 8cf5a71c0e0f8..db914930826ce 100644 --- a/.maintain/rename-crates-for-2.0.sh +++ b/.maintain/rename-crates-for-2.0.sh @@ -105,6 +105,7 @@ TO_RENAME=( "substrate-telemetry sc-telemetry" "substrate-test-primitives sp-test-primitives" "substrate-tracing sc-tracing" + "sc-transaction-pool-api sp-transaction-pool" ); diff --git a/Cargo.lock b/Cargo.lock index d94d22891951c..31a1fd351a44b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3051,7 +3051,7 @@ dependencies = [ "sp-keyring 2.0.0", "sp-runtime 2.0.0", "sp-timestamp 2.0.0", - "sp-transaction-pool-api 2.0.0", + "sp-transaction-pool 2.0.0", "structopt 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-build-script-utils 2.0.0", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3113,7 +3113,7 @@ dependencies = [ "pallet-transaction-payment-rpc 2.0.0", "sc-client 2.0.0", "sp-runtime 2.0.0", - "sp-transaction-pool-api 2.0.0", + "sp-transaction-pool 2.0.0", "substrate-frame-rpc-system 2.0.0", ] @@ -3183,7 +3183,7 @@ dependencies = [ "sp-session 2.0.0", "sp-staking 2.0.0", "sp-std 2.0.0", - "sp-transaction-pool-api 2.0.0", + "sp-transaction-pool 2.0.0", "sp-version 2.0.0", "substrate-wasm-builder-runner 1.0.4", ] @@ -3215,7 +3215,7 @@ dependencies = [ "sp-inherents 2.0.0", "sp-io 2.0.0", "sp-runtime 2.0.0", - "sp-transaction-pool-api 2.0.0", + "sp-transaction-pool 2.0.0", "substrate-build-script-utils 2.0.0", "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", "trie-root 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3250,7 +3250,7 @@ dependencies = [ "sp-runtime 2.0.0", "sp-session 2.0.0", "sp-std 2.0.0", - "sp-transaction-pool-api 2.0.0", + "sp-transaction-pool 2.0.0", "sp-version 2.0.0", "substrate-wasm-builder-runner 1.0.4", ] @@ -4925,7 +4925,7 @@ dependencies = [ "sp-core 2.0.0", "sp-inherents 2.0.0", "sp-runtime 2.0.0", - "sp-transaction-pool-api 2.0.0", + "sp-transaction-pool 2.0.0", "substrate-test-runtime-client 2.0.0", "tokio-executor 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5065,7 +5065,7 @@ dependencies = [ "sp-state-machine 2.0.0", "sp-std 2.0.0", "sp-test-primitives 2.0.0", - "sp-transaction-pool-api 2.0.0", + "sp-transaction-pool 2.0.0", "sp-trie 2.0.0", "sp-version 2.0.0", ] @@ -5433,7 +5433,7 @@ dependencies = [ "sp-core 2.0.0", "sp-offchain 2.0.0", "sp-runtime 2.0.0", - "sp-transaction-pool-api 2.0.0", + "sp-transaction-pool 2.0.0", "substrate-test-runtime-client 2.0.0", "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5480,7 +5480,7 @@ dependencies = [ "sp-runtime 2.0.0", "sp-session 2.0.0", "sp-state-machine 2.0.0", - "sp-transaction-pool-api 2.0.0", + "sp-transaction-pool 2.0.0", "sp-version 2.0.0", "substrate-test-runtime-client 2.0.0", "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5503,7 +5503,7 @@ dependencies = [ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "sp-core 2.0.0", "sp-rpc 2.0.0", - "sp-transaction-pool-api 2.0.0", + "sp-transaction-pool 2.0.0", "sp-version 2.0.0", ] @@ -5574,7 +5574,7 @@ dependencies = [ "sp-io 2.0.0", "sp-runtime 2.0.0", "sp-session 2.0.0", - "sp-transaction-pool-api 2.0.0", + "sp-transaction-pool 2.0.0", "substrate-test-runtime-client 2.0.0", "sysinfo 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)", "target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5599,7 +5599,7 @@ dependencies = [ "sp-consensus 2.0.0", "sp-core 2.0.0", "sp-runtime 2.0.0", - "sp-transaction-pool-api 2.0.0", + "sp-transaction-pool 2.0.0", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5666,7 +5666,7 @@ dependencies = [ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "sp-core 2.0.0", "sp-runtime 2.0.0", - "sp-transaction-pool-api 2.0.0", + "sp-transaction-pool 2.0.0", "substrate-test-runtime 2.0.0", ] @@ -5686,7 +5686,7 @@ dependencies = [ "sp-core 2.0.0", "sp-keyring 2.0.0", "sp-runtime 2.0.0", - "sp-transaction-pool-api 2.0.0", + "sp-transaction-pool 2.0.0", "substrate-test-runtime-client 2.0.0", ] @@ -6480,7 +6480,7 @@ dependencies = [ ] [[package]] -name = "sp-transaction-pool-api" +name = "sp-transaction-pool" version = "2.0.0" dependencies = [ "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6682,7 +6682,7 @@ dependencies = [ "sp-blockchain 2.0.0", "sp-core 2.0.0", "sp-runtime 2.0.0", - "sp-transaction-pool-api 2.0.0", + "sp-transaction-pool 2.0.0", "substrate-test-runtime-client 2.0.0", ] @@ -6737,7 +6737,7 @@ dependencies = [ "sp-session 2.0.0", "sp-state-machine 2.0.0", "sp-std 2.0.0", - "sp-transaction-pool-api 2.0.0", + "sp-transaction-pool 2.0.0", "sp-trie 2.0.0", "sp-version 2.0.0", "substrate-test-runtime-client 2.0.0", diff --git a/bin/node-template/Cargo.toml b/bin/node-template/Cargo.toml index af39bd47f4f58..966c03549fb52 100644 --- a/bin/node-template/Cargo.toml +++ b/bin/node-template/Cargo.toml @@ -25,7 +25,7 @@ sc-executor = { path = "../../client/executor" } sc-service = { path = "../../client/service" } inherents = { package = "sp-inherents", path = "../../primitives/inherents" } txpool = { package = "sc-transaction-pool", path = "../../client/transaction-pool" } -txpool-api = { package = "sp-transaction-pool-api", path = "../../primitives/transaction-pool" } +txpool-api = { package = "sp-transaction-pool", path = "../../primitives/transaction-pool" } network = { package = "sc-network", path = "../../client/network" } aura = { package = "sc-consensus-aura", path = "../../client/consensus/aura" } aura-primitives = { package = "sp-consensus-aura", path = "../../primitives/consensus/aura" } diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml index f4e1ecb972c83..bc4833e6e740e 100644 --- a/bin/node-template/runtime/Cargo.toml +++ b/bin/node-template/runtime/Cargo.toml @@ -29,7 +29,7 @@ support = { package = "frame-support", path = "../../../frame/support", default- system = { package = "frame-system", path = "../../../frame/system", default-features = false } timestamp = { package = "pallet-timestamp", path = "../../../frame/timestamp", default-features = false } transaction-payment = { package = "pallet-transaction-payment", path = "../../../frame/transaction-payment", default-features = false } -sp-transaction-pool = { package = "sp-transaction-pool-api", path = "../../../primitives/transaction-pool", default-features = false } +sp-transaction-pool = { package = "sp-transaction-pool", path = "../../../primitives/transaction-pool", default-features = false } version = { package = "sp-version", path = "../../../primitives/version", default-features = false } [build-dependencies] diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml index 753e22bb42c2a..1a9b931702629 100644 --- a/bin/node/cli/Cargo.toml +++ b/bin/node/cli/Cargo.toml @@ -51,7 +51,7 @@ client-api = { package = "sc-client-api", path = "../../../client/api" } client = { package = "sc-client", path = "../../../client/" } chain-spec = { package = "sc-chain-spec", path = "../../../client/chain-spec" } txpool = { package = "sc-transaction-pool", path = "../../../client/transaction-pool" } -txpool-api = { package = "sp-transaction-pool-api", path = "../../../primitives/transaction-pool" } +txpool-api = { package = "sp-transaction-pool", path = "../../../primitives/transaction-pool" } network = { package = "sc-network", path = "../../../client/network" } babe = { package = "sc-consensus-babe", path = "../../../client/consensus/babe" } grandpa = { package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" } diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml index f3d5536a75734..2aead3b969c45 100644 --- a/bin/node/rpc/Cargo.toml +++ b/bin/node/rpc/Cargo.toml @@ -13,4 +13,4 @@ sp-runtime = { path = "../../../primitives/runtime" } pallet-contracts-rpc = { path = "../../../frame/contracts/rpc/" } pallet-transaction-payment-rpc = { path = "../../../frame/transaction-payment/rpc/" } substrate-frame-rpc-system = { path = "../../../utils/frame/rpc/system" } -txpool-api = { package = "sp-transaction-pool-api", path = "../../../primitives/transaction-pool" } +txpool-api = { package = "sp-transaction-pool", path = "../../../primitives/transaction-pool" } diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml index e1971e81627a7..3c0a0f236c94e 100644 --- a/bin/node/runtime/Cargo.toml +++ b/bin/node/runtime/Cargo.toml @@ -27,7 +27,7 @@ sp-runtime = { path = "../../../primitives/runtime", default-features = false } sp-staking = { path = "../../../primitives/staking", default-features = false } sp-keyring = { path = "../../../primitives/keyring", optional = true } sp-session = { path = "../../../primitives/session", default-features = false } -sp-transaction-pool = { package = "sp-transaction-pool-api", path = "../../../primitives/transaction-pool", default-features = false } +sp-transaction-pool = { package = "sp-transaction-pool", path = "../../../primitives/transaction-pool", default-features = false } version = { package = "sp-version", path = "../../../primitives/version", default-features = false } # frame dependencies diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml index ccaad2b86da3f..f47294d571757 100644 --- a/client/api/Cargo.toml +++ b/client/api/Cargo.toml @@ -28,7 +28,7 @@ sp-runtime = { path = "../../primitives/runtime", default-features = false } state-machine = { package = "sp-state-machine", path = "../../primitives/state-machine" } sc-telemetry = { path = "../telemetry" } trie = { package = "sp-trie", path = "../../primitives/trie" } -txpool-api = { package = "sp-transaction-pool-api", path = "../../primitives/transaction-pool" } +txpool-api = { package = "sp-transaction-pool", path = "../../primitives/transaction-pool" } [dev-dependencies] test-primitives = { package = "sp-test-primitives", path = "../../primitives/test-primitives" } \ No newline at end of file diff --git a/client/basic-authorship/Cargo.toml b/client/basic-authorship/Cargo.toml index 1132ec3c903b3..82eb5c3db9b0a 100644 --- a/client/basic-authorship/Cargo.toml +++ b/client/basic-authorship/Cargo.toml @@ -16,7 +16,7 @@ client-api = { package = "sc-client-api", path = "../api" } consensus_common = { package = "sp-consensus", path = "../../primitives/consensus/common" } inherents = { package = "sp-inherents", path = "../../primitives/inherents" } sc-telemetry = { path = "../telemetry" } -txpool-api = { package = "sp-transaction-pool-api", path = "../../primitives/transaction-pool" } +txpool-api = { package = "sp-transaction-pool", path = "../../primitives/transaction-pool" } block-builder = { package = "sc-block-builder", path = "../block-builder" } tokio-executor = { version = "0.2.0-alpha.6", features = ["blocking"] } diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml index 3d3046ff4145b..5bfffc80f5fd4 100644 --- a/client/offchain/Cargo.toml +++ b/client/offchain/Cargo.toml @@ -36,7 +36,7 @@ env_logger = "0.7.0" test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" } tokio = "0.1.22" txpool = { package = "sc-transaction-pool", path = "../../client/transaction-pool" } -txpool-api = { package = "sp-transaction-pool-api", path = "../../primitives/transaction-pool" } +txpool-api = { package = "sp-transaction-pool", path = "../../primitives/transaction-pool" } [features] default = [] diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml index 4ecc413f58630..ab93d48d2cfac 100644 --- a/client/rpc/Cargo.toml +++ b/client/rpc/Cargo.toml @@ -23,7 +23,7 @@ rpc-primitives = { package = "sp-rpc", path = "../../primitives/rpc" } state_machine = { package = "sp-state-machine", path = "../../primitives/state-machine" } sc-executor = { path = "../executor" } sc-keystore = { path = "../keystore" } -txpool-api = { package = "sp-transaction-pool-api", path = "../../primitives/transaction-pool" } +txpool-api = { package = "sp-transaction-pool", path = "../../primitives/transaction-pool" } sp-blockchain = { path = "../../primitives/blockchain" } hash-db = { version = "0.15.2", default-features = false } parking_lot = { version = "0.9.0" } diff --git a/client/rpc/api/Cargo.toml b/client/rpc/api/Cargo.toml index 6ec73965df9ef..e5e6903215e52 100644 --- a/client/rpc/api/Cargo.toml +++ b/client/rpc/api/Cargo.toml @@ -18,5 +18,5 @@ primitives = { package = "sp-core", path = "../../../primitives/core" } runtime_version = { package = "sp-version", path = "../../../primitives/version" } serde = { version = "1.0.101", features = ["derive"] } serde_json = "1.0.41" -txpool-api = { package = "sp-transaction-pool-api", path = "../../../primitives/transaction-pool" } +txpool-api = { package = "sp-transaction-pool", path = "../../../primitives/transaction-pool" } rpc-primitives = { package = "sp-rpc", path = "../../../primitives/rpc" } diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml index f09fad08de029..0424aa28e7004 100644 --- a/client/service/Cargo.toml +++ b/client/service/Cargo.toml @@ -45,7 +45,7 @@ client_db = { package = "sc-client-db", path = "../db" } codec = { package = "parity-scale-codec", version = "1.0.0" } sc-executor = { path = "../executor" } txpool = { package = "sc-transaction-pool", path = "../transaction-pool" } -sp-transaction-pool = { package = "sp-transaction-pool-api", path = "../../primitives/transaction-pool" } +sp-transaction-pool = { package = "sp-transaction-pool", path = "../../primitives/transaction-pool" } rpc-servers = { package = "sc-rpc-server", path = "../rpc-servers" } rpc = { package = "sc-rpc", path = "../rpc" } tel = { package = "sc-telemetry", path = "../telemetry" } diff --git a/client/service/test/Cargo.toml b/client/service/test/Cargo.toml index 87b4bfface5ab..0a85fe0f6d687 100644 --- a/client/service/test/Cargo.toml +++ b/client/service/test/Cargo.toml @@ -18,4 +18,4 @@ consensus = { package = "sp-consensus", path = "../../../primitives/consensus/co client = { package = "sc-client", path = "../../" } sp-runtime = { path = "../../../primitives/runtime" } primitives = { package = "sp-core", path = "../../../primitives/core" } -txpool-api = { package = "sp-transaction-pool-api", path = "../../../primitives/transaction-pool" } +txpool-api = { package = "sp-transaction-pool", path = "../../../primitives/transaction-pool" } diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml index ff2a5e8f796d2..67cfe7837387d 100644 --- a/client/transaction-pool/Cargo.toml +++ b/client/transaction-pool/Cargo.toml @@ -14,7 +14,7 @@ primitives = { package = "sp-core", path = "../../primitives/core" } sp-api = { path = "../../primitives/api" } sp-runtime = { path = "../../primitives/runtime" } txpool = { package = "sc-transaction-graph", path = "./graph" } -txpool-api = { package = "sp-transaction-pool-api", path = "../../primitives/transaction-pool" } +txpool-api = { package = "sp-transaction-pool", path = "../../primitives/transaction-pool" } client-api = { package = "sc-client-api", path = "../api" } sp-blockchain = { path = "../../primitives/blockchain" } diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml index 9e128557d2feb..a9f5e2e6b1ea3 100644 --- a/client/transaction-pool/graph/Cargo.toml +++ b/client/transaction-pool/graph/Cargo.toml @@ -12,7 +12,7 @@ parking_lot = "0.9.0" serde = { version = "1.0.101", features = ["derive"] } primitives = { package = "sp-core", path = "../../../primitives/core" } sp-runtime = { path = "../../../primitives/runtime" } -txpool-api = { package = "sp-transaction-pool-api", path = "../../../primitives/transaction-pool" } +txpool-api = { package = "sp-transaction-pool", path = "../../../primitives/transaction-pool" } [dev-dependencies] assert_matches = "1.3.0" diff --git a/primitives/transaction-pool/Cargo.toml b/primitives/transaction-pool/Cargo.toml index e1a55d6b37290..1bb0139dc003b 100644 --- a/primitives/transaction-pool/Cargo.toml +++ b/primitives/transaction-pool/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "sp-transaction-pool-api" +name = "sp-transaction-pool" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" diff --git a/test/utils/runtime/Cargo.toml b/test/utils/runtime/Cargo.toml index 549cbd24e7382..afde5a3d14b13 100644 --- a/test/utils/runtime/Cargo.toml +++ b/test/utils/runtime/Cargo.toml @@ -34,7 +34,7 @@ frame-system-rpc-runtime-api = { path = "../../../frame/system/rpc/runtime-api", pallet-timestamp = { path = "../../../frame/timestamp", default-features = false } sc-client = { path = "../../../client", optional = true } sp-trie = { path = "../../../primitives/trie", default-features = false } -sp-transaction-pool = { package = "sp-transaction-pool-api", path = "../../../primitives/transaction-pool", default-features = false } +sp-transaction-pool = { package = "sp-transaction-pool", path = "../../../primitives/transaction-pool", default-features = false } trie-db = { version = "0.16.0", default-features = false } [dev-dependencies] diff --git a/utils/frame/rpc/system/Cargo.toml b/utils/frame/rpc/system/Cargo.toml index d2273f941d63d..0697d15e63114 100644 --- a/utils/frame/rpc/system/Cargo.toml +++ b/utils/frame/rpc/system/Cargo.toml @@ -17,7 +17,7 @@ sp-runtime = { path = "../../../../primitives/runtime" } frame-system-rpc-runtime-api = { path = "../../../../frame/system/rpc/runtime-api" } sp-core = { path = "../../../../primitives/core" } sp-blockchain = { path = "../../../../primitives/blockchain" } -txpool-api = { package = "sp-transaction-pool-api", path = "../../../../primitives/transaction-pool" } +txpool-api = { package = "sp-transaction-pool", path = "../../../../primitives/transaction-pool" } [dev-dependencies] test-client = { package = "substrate-test-runtime-client", path = "../../../../test/utils/runtime/client" } From 33273cc17128b3f5c553b5f7cea8bee5761bcf9d Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Wed, 11 Dec 2019 11:48:41 +0100 Subject: [PATCH 02/11] move primitives/core/derive-debug -> primitives/derive-debug; primitives/core/storage -> primitives/storage --- Cargo.toml | 4 ++-- primitives/arithmetic/Cargo.toml | 2 +- primitives/core/Cargo.toml | 4 ++-- primitives/{core => }/debug-derive/Cargo.toml | 0 primitives/{core => }/debug-derive/src/impls.rs | 0 primitives/{core => }/debug-derive/src/lib.rs | 0 primitives/{core => }/debug-derive/tests/tests.rs | 0 primitives/externalities/Cargo.toml | 2 +- primitives/{core => }/storage/Cargo.toml | 2 +- primitives/{core => }/storage/src/lib.rs | 0 utils/frame/rpc/support/Cargo.toml | 2 +- 11 files changed, 8 insertions(+), 8 deletions(-) rename primitives/{core => }/debug-derive/Cargo.toml (100%) rename primitives/{core => }/debug-derive/src/impls.rs (100%) rename primitives/{core => }/debug-derive/src/lib.rs (100%) rename primitives/{core => }/debug-derive/tests/tests.rs (100%) rename primitives/{core => }/storage/Cargo.toml (88%) rename primitives/{core => }/storage/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 6c0da92499859..6fcd4cd54693f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -101,8 +101,8 @@ members = [ "primitives/consensus/common", "primitives/consensus/pow", "primitives/core", - "primitives/core/debug-derive", - "primitives/core/storage", + "primitives/debug-derive", + "primitives/storage", "primitives/externalities", "primitives/finality-tracker", "primitives/finality-grandpa", diff --git a/primitives/arithmetic/Cargo.toml b/primitives/arithmetic/Cargo.toml index 7b6b8cc64c10d..bc7fd42019a2d 100644 --- a/primitives/arithmetic/Cargo.toml +++ b/primitives/arithmetic/Cargo.toml @@ -10,7 +10,7 @@ integer-sqrt = "0.1.2" num-traits = { version = "0.2.8", default-features = false } sp-std = { path = "../std", default-features = false } serde = { version = "1.0.101", optional = true, features = ["derive"] } -sp-debug-derive = { path = "../../primitives/core/debug-derive", default-features = false } +sp-debug-derive = { path = "../../primitives/debug-derive", default-features = false } [dev-dependencies] primitive-types = "0.6.0" diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml index d8e25138791ad..a975dc4a42c28 100644 --- a/primitives/core/Cargo.toml +++ b/primitives/core/Cargo.toml @@ -25,9 +25,9 @@ num-traits = { version = "0.2.8", default-features = false } zeroize = { version = "1.0.0", default-features = false } lazy_static = { version = "1.4.0", default-features = false, optional = true } parking_lot = { version = "0.9.0", optional = true } -sp-debug-derive = { version = "2.0.0", path = "./debug-derive" } +sp-debug-derive = { version = "2.0.0", path = "../debug-derive" } externalities = { package = "sp-externalities", path = "../externalities", optional = true } -primitives-storage = { package = "sp-core-storage", path = "storage", default-features = false } +primitives-storage = { package = "sp-core-storage", path = "../storage", default-features = false } # full crypto ed25519-dalek = { version = "1.0.0-pre.3", default-features = false, features = ["u64_backend", "alloc"], optional = true } diff --git a/primitives/core/debug-derive/Cargo.toml b/primitives/debug-derive/Cargo.toml similarity index 100% rename from primitives/core/debug-derive/Cargo.toml rename to primitives/debug-derive/Cargo.toml diff --git a/primitives/core/debug-derive/src/impls.rs b/primitives/debug-derive/src/impls.rs similarity index 100% rename from primitives/core/debug-derive/src/impls.rs rename to primitives/debug-derive/src/impls.rs diff --git a/primitives/core/debug-derive/src/lib.rs b/primitives/debug-derive/src/lib.rs similarity index 100% rename from primitives/core/debug-derive/src/lib.rs rename to primitives/debug-derive/src/lib.rs diff --git a/primitives/core/debug-derive/tests/tests.rs b/primitives/debug-derive/tests/tests.rs similarity index 100% rename from primitives/core/debug-derive/tests/tests.rs rename to primitives/debug-derive/tests/tests.rs diff --git a/primitives/externalities/Cargo.toml b/primitives/externalities/Cargo.toml index 8a89a0be08e5a..cc4f72cd07987 100644 --- a/primitives/externalities/Cargo.toml +++ b/primitives/externalities/Cargo.toml @@ -6,6 +6,6 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -primitives-storage = { package = "sp-core-storage", path = "../core/storage" } +primitives-storage = { package = "sp-core-storage", path = "../storage" } sp-std = { path = "../std" } environmental = { version = "1.0.2" } diff --git a/primitives/core/storage/Cargo.toml b/primitives/storage/Cargo.toml similarity index 88% rename from primitives/core/storage/Cargo.toml rename to primitives/storage/Cargo.toml index d124dd47e1721..05037c1336d05 100644 --- a/primitives/core/storage/Cargo.toml +++ b/primitives/storage/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" description = "Storage related primitives" [dependencies] -sp-std = { path = "../../std", default-features = false } +sp-std = { path = "../std", default-features = false } serde = { version = "1.0.101", optional = true, features = ["derive"] } impl-serde = { version = "0.2.3", optional = true } sp-debug-derive = { version = "2.0.0", path = "../debug-derive" } diff --git a/primitives/core/storage/src/lib.rs b/primitives/storage/src/lib.rs similarity index 100% rename from primitives/core/storage/src/lib.rs rename to primitives/storage/src/lib.rs diff --git a/utils/frame/rpc/support/Cargo.toml b/utils/frame/rpc/support/Cargo.toml index d2ca6c060e224..b2dbb843a17f0 100644 --- a/utils/frame/rpc/support/Cargo.toml +++ b/utils/frame/rpc/support/Cargo.toml @@ -11,7 +11,7 @@ jsonrpc-core = "14" parity-scale-codec = "1" serde = "1" frame-support = { path = "../../../../frame/support" } -sp-core-storage = { path = "../../../../primitives/core/storage" } +sp-core-storage = { path = "../../../../primitives/storage" } sc-rpc-api = { path = "../../../../client/rpc/api" } [dev-dependencies] From f01d833325f51312eab9d527bc777af94c27b424 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Wed, 11 Dec 2019 11:50:58 +0100 Subject: [PATCH 03/11] rename crate sp-core-storage -> sp-storage --- .maintain/rename-crates-for-2.0.sh | 7 +++++-- Cargo.lock | 26 +++++++++++++------------- primitives/core/Cargo.toml | 2 +- primitives/externalities/Cargo.toml | 2 +- primitives/storage/Cargo.toml | 2 +- utils/frame/rpc/support/Cargo.toml | 2 +- 6 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.maintain/rename-crates-for-2.0.sh b/.maintain/rename-crates-for-2.0.sh index db914930826ce..529861e78e43a 100644 --- a/.maintain/rename-crates-for-2.0.sh +++ b/.maintain/rename-crates-for-2.0.sh @@ -34,9 +34,13 @@ function rename() { TO_RENAME=( # OLD-CRATE-NAME NEW-CRATE-NAME + # post initial rename fixes + "sc-application-crypto sp-application-crypto" + "sp-transaction-pool-api sp-transaction-pool" + "sp-core-storage sp-storage" + # PRIMITIVES "substrate-application-crypto sp-application-crypto" - "sc-application-crypto sp-application-crypto" "substrate-authority-discovery-primitives sp-authority-discovery" "substrate-block-builder-runtime-api sp-block-builder" "substrate-consensus-aura-primitives sp-consensus-aura" @@ -105,7 +109,6 @@ TO_RENAME=( "substrate-telemetry sc-telemetry" "substrate-test-primitives sp-test-primitives" "substrate-tracing sc-tracing" - "sc-transaction-pool-api sp-transaction-pool" ); diff --git a/Cargo.lock b/Cargo.lock index 31a1fd351a44b..03e5f0f00afa4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6184,12 +6184,12 @@ dependencies = [ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-core-storage 2.0.0", "sp-debug-derive 2.0.0", "sp-externalities 2.0.0", "sp-runtime-interface 2.0.0", "sp-serializer 2.0.0", "sp-std 2.0.0", + "sp-storage 2.0.0", "substrate-bip39 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-bip39 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6198,16 +6198,6 @@ dependencies = [ "zeroize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "sp-core-storage" -version = "2.0.0" -dependencies = [ - "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-debug-derive 2.0.0", - "sp-std 2.0.0", -] - [[package]] name = "sp-debug-derive" version = "2.0.0" @@ -6222,8 +6212,8 @@ name = "sp-externalities" version = "2.0.0" dependencies = [ "environmental 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-core-storage 2.0.0", "sp-std 2.0.0", + "sp-storage 2.0.0", ] [[package]] @@ -6456,6 +6446,16 @@ dependencies = [ name = "sp-std" version = "2.0.0" +[[package]] +name = "sp-storage" +version = "2.0.0" +dependencies = [ + "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-debug-derive 2.0.0", + "sp-std 2.0.0", +] + [[package]] name = "sp-test-primitives" version = "2.0.0" @@ -6660,7 +6660,7 @@ dependencies = [ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "sc-rpc-api 2.0.0", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-core-storage 2.0.0", + "sp-storage 2.0.0", "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml index a975dc4a42c28..bde9d37ee0c20 100644 --- a/primitives/core/Cargo.toml +++ b/primitives/core/Cargo.toml @@ -27,7 +27,7 @@ lazy_static = { version = "1.4.0", default-features = false, optional = true } parking_lot = { version = "0.9.0", optional = true } sp-debug-derive = { version = "2.0.0", path = "../debug-derive" } externalities = { package = "sp-externalities", path = "../externalities", optional = true } -primitives-storage = { package = "sp-core-storage", path = "../storage", default-features = false } +primitives-storage = { package = "sp-storage", path = "../storage", default-features = false } # full crypto ed25519-dalek = { version = "1.0.0-pre.3", default-features = false, features = ["u64_backend", "alloc"], optional = true } diff --git a/primitives/externalities/Cargo.toml b/primitives/externalities/Cargo.toml index cc4f72cd07987..d64d104baa9b2 100644 --- a/primitives/externalities/Cargo.toml +++ b/primitives/externalities/Cargo.toml @@ -6,6 +6,6 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -primitives-storage = { package = "sp-core-storage", path = "../storage" } +primitives-storage = { package = "sp-storage", path = "../storage" } sp-std = { path = "../std" } environmental = { version = "1.0.2" } diff --git a/primitives/storage/Cargo.toml b/primitives/storage/Cargo.toml index 05037c1336d05..d3fc7267bfc91 100644 --- a/primitives/storage/Cargo.toml +++ b/primitives/storage/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "sp-core-storage" +name = "sp-storage" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" diff --git a/utils/frame/rpc/support/Cargo.toml b/utils/frame/rpc/support/Cargo.toml index b2dbb843a17f0..1833322cd679b 100644 --- a/utils/frame/rpc/support/Cargo.toml +++ b/utils/frame/rpc/support/Cargo.toml @@ -11,7 +11,7 @@ jsonrpc-core = "14" parity-scale-codec = "1" serde = "1" frame-support = { path = "../../../../frame/support" } -sp-core-storage = { path = "../../../../primitives/storage" } +sp-storage = { path = "../../../../primitives/storage" } sc-rpc-api = { path = "../../../../client/rpc/api" } [dev-dependencies] From d37ada16ff8922f91d5d3c69a38fb53e8266753f Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Wed, 11 Dec 2019 12:02:54 +0100 Subject: [PATCH 04/11] rename and move: test/utils/transaction-factory -> client/transaction-factory --- .maintain/rename-crates-for-2.0.sh | 1 + Cargo.lock | 38 +++++++++---------- Cargo.toml | 2 +- bin/node/cli/Cargo.toml | 4 +- bin/node/cli/src/cli.rs | 6 +-- bin/node/cli/src/factory_impl.rs | 4 +- client/transaction-factory/Cargo.toml | 19 ++++++++++ .../transaction-factory/src/complex_mode.rs | 0 .../transaction-factory/src/lib.rs | 0 .../transaction-factory/src/modes.rs | 0 .../transaction-factory/src/simple_modes.rs | 0 test/utils/transaction-factory/Cargo.toml | 22 +++++------ 12 files changed, 58 insertions(+), 38 deletions(-) create mode 100644 client/transaction-factory/Cargo.toml rename {test/utils => client}/transaction-factory/src/complex_mode.rs (100%) rename {test/utils => client}/transaction-factory/src/lib.rs (100%) rename {test/utils => client}/transaction-factory/src/modes.rs (100%) rename {test/utils => client}/transaction-factory/src/simple_modes.rs (100%) diff --git a/.maintain/rename-crates-for-2.0.sh b/.maintain/rename-crates-for-2.0.sh index 529861e78e43a..2561a79a6636e 100644 --- a/.maintain/rename-crates-for-2.0.sh +++ b/.maintain/rename-crates-for-2.0.sh @@ -38,6 +38,7 @@ TO_RENAME=( "sc-application-crypto sp-application-crypto" "sp-transaction-pool-api sp-transaction-pool" "sp-core-storage sp-storage" + "transaction-factory sc-transaction-factory" # PRIMITIVES "substrate-application-crypto sp-application-crypto" diff --git a/Cargo.lock b/Cargo.lock index 03e5f0f00afa4..fd82b0ad962ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3038,6 +3038,7 @@ dependencies = [ "sc-service 2.0.0", "sc-service-test 2.0.0", "sc-telemetry 2.0.0", + "sc-transaction-factory 0.0.1", "sc-transaction-pool 2.0.0", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "sp-authority-discovery 2.0.0", @@ -3056,7 +3057,6 @@ dependencies = [ "substrate-build-script-utils 2.0.0", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", - "transaction-factory 0.0.1", "vergen 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", "wasm-bindgen-futures 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5652,6 +5652,24 @@ dependencies = [ "tracing-core 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "sc-transaction-factory" +version = "0.0.1" +dependencies = [ + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sc-cli 2.0.0", + "sc-client 2.0.0", + "sc-client-api 2.0.0", + "sc-service 2.0.0", + "sp-api 2.0.0", + "sp-block-builder 2.0.0", + "sp-blockchain 2.0.0", + "sp-consensus 2.0.0", + "sp-core 2.0.0", + "sp-runtime 2.0.0", +] + [[package]] name = "sc-transaction-graph" version = "2.0.0" @@ -7297,24 +7315,6 @@ name = "traitobject" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "transaction-factory" -version = "0.0.1" -dependencies = [ - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sc-cli 2.0.0", - "sc-client 2.0.0", - "sc-client-api 2.0.0", - "sc-service 2.0.0", - "sp-api 2.0.0", - "sp-block-builder 2.0.0", - "sp-blockchain 2.0.0", - "sp-consensus 2.0.0", - "sp-core 2.0.0", - "sp-runtime 2.0.0", -] - [[package]] name = "trie-bench" version = "0.17.0" diff --git a/Cargo.toml b/Cargo.toml index 6fcd4cd54693f..da49e24122908 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -138,7 +138,7 @@ members = [ "test/utils/client", "test/utils/runtime", "test/utils/runtime/client", - "test/utils/transaction-factory", + "client/transaction-factory", "utils/build-script-utils", "utils/fork-tree", "utils/frame/rpc/support", diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml index 1a9b931702629..3a2e968ca84c9 100644 --- a/bin/node/cli/Cargo.toml +++ b/bin/node/cli/Cargo.toml @@ -83,7 +83,7 @@ node-executor = { path = "../executor" } # CLI-specific dependencies tokio = { version = "0.1.22", optional = true } sc-cli = { path = "../../../client/cli", optional = true } -transaction-factory = { path = "../../../test/utils/transaction-factory", optional = true } +sc-transaction-factory = { path = "../../../client/transaction-factory", optional = true } ctrlc = { version = "3.1.3", features = ["termination"], optional = true } # WASM-specific dependencies @@ -126,7 +126,7 @@ browser = [ ] cli = [ "sc-cli", - "transaction-factory", + "sc-transaction-factory", "tokio", "ctrlc", "sc-service/rocksdb", diff --git a/bin/node/cli/src/cli.rs b/bin/node/cli/src/cli.rs index add6eaa590c48..500e701f0af23 100644 --- a/bin/node/cli/src/cli.rs +++ b/bin/node/cli/src/cli.rs @@ -24,7 +24,7 @@ use structopt::{StructOpt, clap::App}; use sc_cli::{display_role, parse_and_prepare, AugmentClap, GetLogFilter, ParseAndPrepare}; use crate::{service, ChainSpec, load_spec}; use crate::factory_impl::FactoryState; -use transaction_factory::RuntimeAdapter; +use sc_transaction_factory::RuntimeAdapter; /// Custom subcommands. #[derive(Clone, Debug, StructOpt)] @@ -70,7 +70,7 @@ pub struct FactoryCmd { /// /// These three modes control manufacturing. #[structopt(long="mode", default_value = "MasterToN")] - pub mode: transaction_factory::Mode, + pub mode: sc_transaction_factory::Mode, /// Number of transactions to generate. In mode `MasterNToNToM` this is /// the number of transactions per round. @@ -155,7 +155,7 @@ pub fn run(args: I, exit: E, version: sc_cli::VersionInfo) -> error::Re ); let service_builder = new_full_start!(config).0; - transaction_factory::factory::, _, _, _, _, _>( + sc_transaction_factory::factory::, _, _, _, _, _>( factory_state, service_builder.client(), service_builder.select_chain() diff --git a/bin/node/cli/src/factory_impl.rs b/bin/node/cli/src/factory_impl.rs index af0633ab642a6..780694a699b7e 100644 --- a/bin/node/cli/src/factory_impl.rs +++ b/bin/node/cli/src/factory_impl.rs @@ -32,8 +32,8 @@ use primitives::{sr25519, crypto::Pair}; use sp_runtime::{ generic::Era, traits::{Block as BlockT, Header as HeaderT, SignedExtension, Verify, IdentifyAccount} }; -use transaction_factory::RuntimeAdapter; -use transaction_factory::modes::Mode; +use sc_transaction_factory::RuntimeAdapter; +use sc_transaction_factory::modes::Mode; use inherents::InherentData; use sp_timestamp; use sp_finality_tracker; diff --git a/client/transaction-factory/Cargo.toml b/client/transaction-factory/Cargo.toml new file mode 100644 index 0000000000000..76293b6e071ff --- /dev/null +++ b/client/transaction-factory/Cargo.toml @@ -0,0 +1,19 @@ +[package] +name = "sc-transaction-factory" +version = "0.0.1" +authors = ["Parity Technologies "] +edition = "2018" + +[dependencies] +block-builder-api = { package = "sp-block-builder", path = "../../primitives/block-builder" } +cli = { package = "sc-cli", path = "../cli" } +client-api = { package = "sc-client-api", path = "../api" } +client = { package = "sc-client", path = "../" } +codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } +consensus_common = { package = "sp-consensus", path = "../../primitives/consensus/common" } +log = "0.4.8" +primitives = { package = "sp-core", path = "../../primitives/core" } +sp-api = { path = "../../primitives/api" } +sp-runtime = { path = "../../primitives/runtime" } +sc-service = { path = "../service" } +sp-blockchain = { path = "../../primitives/blockchain" } diff --git a/test/utils/transaction-factory/src/complex_mode.rs b/client/transaction-factory/src/complex_mode.rs similarity index 100% rename from test/utils/transaction-factory/src/complex_mode.rs rename to client/transaction-factory/src/complex_mode.rs diff --git a/test/utils/transaction-factory/src/lib.rs b/client/transaction-factory/src/lib.rs similarity index 100% rename from test/utils/transaction-factory/src/lib.rs rename to client/transaction-factory/src/lib.rs diff --git a/test/utils/transaction-factory/src/modes.rs b/client/transaction-factory/src/modes.rs similarity index 100% rename from test/utils/transaction-factory/src/modes.rs rename to client/transaction-factory/src/modes.rs diff --git a/test/utils/transaction-factory/src/simple_modes.rs b/client/transaction-factory/src/simple_modes.rs similarity index 100% rename from test/utils/transaction-factory/src/simple_modes.rs rename to client/transaction-factory/src/simple_modes.rs diff --git a/test/utils/transaction-factory/Cargo.toml b/test/utils/transaction-factory/Cargo.toml index 956e58b88af03..76293b6e071ff 100644 --- a/test/utils/transaction-factory/Cargo.toml +++ b/test/utils/transaction-factory/Cargo.toml @@ -1,19 +1,19 @@ [package] -name = "transaction-factory" +name = "sc-transaction-factory" version = "0.0.1" authors = ["Parity Technologies "] edition = "2018" [dependencies] -block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder" } -cli = { package = "sc-cli", path = "../../../client/cli" } -client-api = { package = "sc-client-api", path = "../../../client/api" } -client = { package = "sc-client", path = "../../../client" } +block-builder-api = { package = "sp-block-builder", path = "../../primitives/block-builder" } +cli = { package = "sc-cli", path = "../cli" } +client-api = { package = "sc-client-api", path = "../api" } +client = { package = "sc-client", path = "../" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } -consensus_common = { package = "sp-consensus", path = "../../../primitives/consensus/common" } +consensus_common = { package = "sp-consensus", path = "../../primitives/consensus/common" } log = "0.4.8" -primitives = { package = "sp-core", path = "../../../primitives/core" } -sp-api = { path = "../../../primitives/api" } -sp-runtime = { path = "../../../primitives/runtime" } -sc-service = { path = "../../../client/service" } -sp-blockchain = { path = "../../../primitives/blockchain" } +primitives = { package = "sp-core", path = "../../primitives/core" } +sp-api = { path = "../../primitives/api" } +sp-runtime = { path = "../../primitives/runtime" } +sc-service = { path = "../service" } +sp-blockchain = { path = "../../primitives/blockchain" } From 9629f99e56babfb9410b52f86f8d0610c585bac7 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Wed, 11 Dec 2019 12:50:34 +0100 Subject: [PATCH 05/11] move transaction-factory -> node/transaction-factory --- .maintain/rename-crates-for-2.0.sh | 2 +- Cargo.lock | 38 +++++++++---------- Cargo.toml | 2 +- bin/node/cli/Cargo.toml | 4 +- bin/node/transaction-factory/Cargo.toml | 19 ++++++++++ .../transaction-factory/src/complex_mode.rs | 0 .../node}/transaction-factory/src/lib.rs | 0 .../node}/transaction-factory/src/modes.rs | 0 .../transaction-factory/src/simple_modes.rs | 0 client/transaction-factory/Cargo.toml | 19 ---------- 10 files changed, 42 insertions(+), 42 deletions(-) create mode 100644 bin/node/transaction-factory/Cargo.toml rename {client => bin/node}/transaction-factory/src/complex_mode.rs (100%) rename {client => bin/node}/transaction-factory/src/lib.rs (100%) rename {client => bin/node}/transaction-factory/src/modes.rs (100%) rename {client => bin/node}/transaction-factory/src/simple_modes.rs (100%) delete mode 100644 client/transaction-factory/Cargo.toml diff --git a/.maintain/rename-crates-for-2.0.sh b/.maintain/rename-crates-for-2.0.sh index 2561a79a6636e..36d207614717a 100644 --- a/.maintain/rename-crates-for-2.0.sh +++ b/.maintain/rename-crates-for-2.0.sh @@ -38,7 +38,7 @@ TO_RENAME=( "sc-application-crypto sp-application-crypto" "sp-transaction-pool-api sp-transaction-pool" "sp-core-storage sp-storage" - "transaction-factory sc-transaction-factory" + "transaction-factory node-transaction-factory" # PRIMITIVES "substrate-application-crypto sp-application-crypto" diff --git a/Cargo.lock b/Cargo.lock index fd82b0ad962ea..e301f48c070a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3012,6 +3012,7 @@ dependencies = [ "node-primitives 2.0.0", "node-rpc 2.0.0", "node-runtime 2.0.0", + "node-transaction-factory 0.0.1", "pallet-authority-discovery 0.1.0", "pallet-balances 2.0.0", "pallet-contracts 2.0.0", @@ -3038,7 +3039,6 @@ dependencies = [ "sc-service 2.0.0", "sc-service-test 2.0.0", "sc-telemetry 2.0.0", - "sc-transaction-factory 0.0.1", "sc-transaction-pool 2.0.0", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "sp-authority-discovery 2.0.0", @@ -3284,6 +3284,24 @@ dependencies = [ "wabt 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "node-transaction-factory" +version = "0.0.1" +dependencies = [ + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sc-cli 2.0.0", + "sc-client 2.0.0", + "sc-client-api 2.0.0", + "sc-service 2.0.0", + "sp-api 2.0.0", + "sp-block-builder 2.0.0", + "sp-blockchain 2.0.0", + "sp-consensus 2.0.0", + "sp-core 2.0.0", + "sp-runtime 2.0.0", +] + [[package]] name = "nodrop" version = "0.1.14" @@ -5652,24 +5670,6 @@ dependencies = [ "tracing-core 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "sc-transaction-factory" -version = "0.0.1" -dependencies = [ - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sc-cli 2.0.0", - "sc-client 2.0.0", - "sc-client-api 2.0.0", - "sc-service 2.0.0", - "sp-api 2.0.0", - "sp-block-builder 2.0.0", - "sp-blockchain 2.0.0", - "sp-consensus 2.0.0", - "sp-core 2.0.0", - "sp-runtime 2.0.0", -] - [[package]] name = "sc-transaction-graph" version = "2.0.0" diff --git a/Cargo.toml b/Cargo.toml index da49e24122908..42e2e3fa2fe0c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,6 +9,7 @@ members = [ "bin/node/rpc", "bin/node/runtime", "bin/node/testing", + "bin/node/transaction-factory", "bin/subkey", "client", "client/api", @@ -138,7 +139,6 @@ members = [ "test/utils/client", "test/utils/runtime", "test/utils/runtime/client", - "client/transaction-factory", "utils/build-script-utils", "utils/fork-tree", "utils/frame/rpc/support", diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml index 3a2e968ca84c9..3d356ce5e40d8 100644 --- a/bin/node/cli/Cargo.toml +++ b/bin/node/cli/Cargo.toml @@ -83,8 +83,8 @@ node-executor = { path = "../executor" } # CLI-specific dependencies tokio = { version = "0.1.22", optional = true } sc-cli = { path = "../../../client/cli", optional = true } -sc-transaction-factory = { path = "../../../client/transaction-factory", optional = true } ctrlc = { version = "3.1.3", features = ["termination"], optional = true } +node-transaction-factory = { path = "../transaction-factory", optional = true } # WASM-specific dependencies libp2p = { version = "0.13.0", default-features = false, optional = true } @@ -126,7 +126,7 @@ browser = [ ] cli = [ "sc-cli", - "sc-transaction-factory", + "node-transaction-factory", "tokio", "ctrlc", "sc-service/rocksdb", diff --git a/bin/node/transaction-factory/Cargo.toml b/bin/node/transaction-factory/Cargo.toml new file mode 100644 index 0000000000000..ab17c52b0dcd9 --- /dev/null +++ b/bin/node/transaction-factory/Cargo.toml @@ -0,0 +1,19 @@ +[package] +name = "node-transaction-factory" +version = "0.0.1" +authors = ["Parity Technologies "] +edition = "2018" + +[dependencies] +block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder" } +cli = { package = "sc-cli", path = "../../../client/cli" } +client-api = { package = "sc-client-api", path = "../../../client/api" } +client = { package = "sc-client", path = "../../../client" } +codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } +consensus_common = { package = "sp-consensus", path = "../../../primitives/consensus/common" } +log = "0.4.8" +primitives = { package = "sp-core", path = "../../../primitives/core" } +sp-api = { path = "../../../primitives/api" } +sp-runtime = { path = "../../../primitives/runtime" } +sc-service = { path = "../../../client/service" } +sp-blockchain = { path = "../../../primitives/blockchain" } diff --git a/client/transaction-factory/src/complex_mode.rs b/bin/node/transaction-factory/src/complex_mode.rs similarity index 100% rename from client/transaction-factory/src/complex_mode.rs rename to bin/node/transaction-factory/src/complex_mode.rs diff --git a/client/transaction-factory/src/lib.rs b/bin/node/transaction-factory/src/lib.rs similarity index 100% rename from client/transaction-factory/src/lib.rs rename to bin/node/transaction-factory/src/lib.rs diff --git a/client/transaction-factory/src/modes.rs b/bin/node/transaction-factory/src/modes.rs similarity index 100% rename from client/transaction-factory/src/modes.rs rename to bin/node/transaction-factory/src/modes.rs diff --git a/client/transaction-factory/src/simple_modes.rs b/bin/node/transaction-factory/src/simple_modes.rs similarity index 100% rename from client/transaction-factory/src/simple_modes.rs rename to bin/node/transaction-factory/src/simple_modes.rs diff --git a/client/transaction-factory/Cargo.toml b/client/transaction-factory/Cargo.toml deleted file mode 100644 index 76293b6e071ff..0000000000000 --- a/client/transaction-factory/Cargo.toml +++ /dev/null @@ -1,19 +0,0 @@ -[package] -name = "sc-transaction-factory" -version = "0.0.1" -authors = ["Parity Technologies "] -edition = "2018" - -[dependencies] -block-builder-api = { package = "sp-block-builder", path = "../../primitives/block-builder" } -cli = { package = "sc-cli", path = "../cli" } -client-api = { package = "sc-client-api", path = "../api" } -client = { package = "sc-client", path = "../" } -codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } -consensus_common = { package = "sp-consensus", path = "../../primitives/consensus/common" } -log = "0.4.8" -primitives = { package = "sp-core", path = "../../primitives/core" } -sp-api = { path = "../../primitives/api" } -sp-runtime = { path = "../../primitives/runtime" } -sc-service = { path = "../service" } -sp-blockchain = { path = "../../primitives/blockchain" } From 057f4153d3f74f29766e773dff1f73058a81bdfb Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Wed, 11 Dec 2019 13:03:29 +0100 Subject: [PATCH 06/11] fix missing rename --- utils/frame/rpc/support/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/frame/rpc/support/src/lib.rs b/utils/frame/rpc/support/src/lib.rs index c16e31f7e057e..396c5215017fa 100644 --- a/utils/frame/rpc/support/src/lib.rs +++ b/utils/frame/rpc/support/src/lib.rs @@ -27,7 +27,7 @@ use serde::{de::DeserializeOwned, Serialize}; use frame_support::storage::generator::{ StorageDoubleMap, StorageLinkedMap, StorageMap, StorageValue }; -use sp_core_storage::{StorageData, StorageKey}; +use sp_storage::{StorageData, StorageKey}; use sc_rpc_api::state::StateClient; /// A typed query on chain state usable from an RPC client. From 39b2a6f24a30ecfa5b626e1835024e3daefd7f12 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Wed, 11 Dec 2019 13:21:09 +0100 Subject: [PATCH 07/11] Move chain-spec-builder into bin/utils --- Cargo.toml | 2 +- {test => bin}/utils/chain-spec-builder/Cargo.toml | 2 +- {test => bin}/utils/chain-spec-builder/build.rs | 0 {test => bin}/utils/chain-spec-builder/src/main.rs | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename {test => bin}/utils/chain-spec-builder/Cargo.toml (88%) rename {test => bin}/utils/chain-spec-builder/build.rs (100%) rename {test => bin}/utils/chain-spec-builder/src/main.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 42e2e3fa2fe0c..5e6dc48a30ec3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,6 +11,7 @@ members = [ "bin/node/testing", "bin/node/transaction-factory", "bin/subkey", + "bin/utils/chain-spec-builder", "client", "client/api", "client/authority-discovery", @@ -135,7 +136,6 @@ members = [ "primitives/transaction-pool", "primitives/trie", "primitives/wasm-interface", - "test/utils/chain-spec-builder", "test/utils/client", "test/utils/runtime", "test/utils/runtime/client", diff --git a/test/utils/chain-spec-builder/Cargo.toml b/bin/utils/chain-spec-builder/Cargo.toml similarity index 88% rename from test/utils/chain-spec-builder/Cargo.toml rename to bin/utils/chain-spec-builder/Cargo.toml index 32829bdb513cf..4d317d3a544c6 100644 --- a/test/utils/chain-spec-builder/Cargo.toml +++ b/bin/utils/chain-spec-builder/Cargo.toml @@ -8,7 +8,7 @@ build = "build.rs" [dependencies] ansi_term = "0.12.1" keystore = { package = "sc-keystore", path = "../../../client/keystore" } -node-cli = { path = "../../../bin/node/cli" } +node-cli = { path = "../../node/cli" } primitives = { package = "sp-core", path = "../../../primitives/core" } rand = "0.7.2" structopt = "0.3.3" diff --git a/test/utils/chain-spec-builder/build.rs b/bin/utils/chain-spec-builder/build.rs similarity index 100% rename from test/utils/chain-spec-builder/build.rs rename to bin/utils/chain-spec-builder/build.rs diff --git a/test/utils/chain-spec-builder/src/main.rs b/bin/utils/chain-spec-builder/src/main.rs similarity index 100% rename from test/utils/chain-spec-builder/src/main.rs rename to bin/utils/chain-spec-builder/src/main.rs From c5c6fbfe04a4fa5ecb33bde8159051089f81c6f8 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Wed, 11 Dec 2019 13:22:04 +0100 Subject: [PATCH 08/11] move subkey into bin/utils --- Cargo.toml | 2 +- bin/{ => utils}/subkey/Cargo.toml | 14 +++++++------- bin/{ => utils}/subkey/README.adoc | 0 bin/{ => utils}/subkey/src/main.rs | 0 bin/{ => utils}/subkey/src/vanity.rs | 0 5 files changed, 8 insertions(+), 8 deletions(-) rename bin/{ => utils}/subkey/Cargo.toml (53%) rename bin/{ => utils}/subkey/README.adoc (100%) rename bin/{ => utils}/subkey/src/main.rs (100%) rename bin/{ => utils}/subkey/src/vanity.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 5e6dc48a30ec3..b423ecbd38113 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ members = [ "bin/node/runtime", "bin/node/testing", "bin/node/transaction-factory", - "bin/subkey", + "bin/utils/subkey", "bin/utils/chain-spec-builder", "client", "client/api", diff --git a/bin/subkey/Cargo.toml b/bin/utils/subkey/Cargo.toml similarity index 53% rename from bin/subkey/Cargo.toml rename to bin/utils/subkey/Cargo.toml index 50cffad7de371..a173c10130ba5 100644 --- a/bin/subkey/Cargo.toml +++ b/bin/utils/subkey/Cargo.toml @@ -5,10 +5,10 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -primitives = { package = "sp-core", version = "*", path = "../../primitives/core" } -node-runtime = { version = "*", path = "../node/runtime" } -node-primitives = { version = "*", path = "../node/primitives" } -sp-runtime = { version = "*", path = "../../primitives/runtime" } +primitives = { package = "sp-core", version = "*", path = "../../../primitives/core" } +node-runtime = { version = "*", path = "../../node/runtime" } +node-primitives = { version = "*", path = "../../node/primitives" } +sp-runtime = { version = "*", path = "../../../primitives/runtime" } rand = "0.7.2" clap = "2.33.0" tiny-bip39 = "0.6.2" @@ -17,9 +17,9 @@ substrate-bip39 = "0.3.1" hex = "0.4.0" hex-literal = "0.2.1" codec = { package = "parity-scale-codec", version = "1.0.0" } -system = { package = "frame-system", path = "../../frame/system" } -balances = { package = "pallet-balances", path = "../../frame/balances" } -transaction-payment = { package = "pallet-transaction-payment", path = "../../frame/transaction-payment" } +system = { package = "frame-system", path = "../../../frame/system" } +balances = { package = "pallet-balances", path = "../../../frame/balances" } +transaction-payment = { package = "pallet-transaction-payment", path = "../../../frame/transaction-payment" } [features] bench = [] diff --git a/bin/subkey/README.adoc b/bin/utils/subkey/README.adoc similarity index 100% rename from bin/subkey/README.adoc rename to bin/utils/subkey/README.adoc diff --git a/bin/subkey/src/main.rs b/bin/utils/subkey/src/main.rs similarity index 100% rename from bin/subkey/src/main.rs rename to bin/utils/subkey/src/main.rs diff --git a/bin/subkey/src/vanity.rs b/bin/utils/subkey/src/vanity.rs similarity index 100% rename from bin/subkey/src/vanity.rs rename to bin/utils/subkey/src/vanity.rs From 857a2d2ef89f9566edd82fb3140fdec7c229340c Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Wed, 11 Dec 2019 13:28:05 +0100 Subject: [PATCH 09/11] Update new subkey location --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 04b1616f6a336..496de058d1314 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -122,7 +122,7 @@ cargo-check-subkey: except: - /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1 script: - - cd ./bin/subkey + - cd ./bin/utils/subkey - BUILD_DUMMY_WASM_BINARY=1 time cargo check --release - sccache -s @@ -300,7 +300,7 @@ build-linux-subkey: variables: - $DEPLOY_TAG script: - - cd ./bin/subkey + - cd ./bin/utils/subkey - BUILD_DUMMY_WASM_BINARY=1 time cargo build --release --verbose - cd - - sccache -s From aa65d8c81d0e154e7d1efb9e0eaf642aeae38dc8 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Wed, 11 Dec 2019 13:28:23 +0100 Subject: [PATCH 10/11] Update docs to reflect new location for utils --- docs/Structure.adoc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/Structure.adoc b/docs/Structure.adoc index cff2b48019135..cb0e4b28cb001 100644 --- a/docs/Structure.adoc +++ b/docs/Structure.adoc @@ -87,11 +87,14 @@ The default (testing) application pulling together our recommended setup of subs We also provide a template to get you started building your own node. -==== Subkey +==== Utils -* _found in_: `/bin/subkey` +* _found in_: `/bin/utils` -Subkey is a client library to generate keys and sign transactions to send to a substrate node. +- **subkey** + Subkey is a client library to generate keys and sign transactions to send to a substrate node. +- **chain-spec-builder** + The chain spec builder builds a chain specification that includes a Substrate runtime compiled as WASM. To ensure proper functioning of the included runtime compile (or run) the chain spec builder binary in `--release` mode. == Internal Dependency Tree From d277ed413e6201ef403e3e34494e5c60858829dc Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Wed, 11 Dec 2019 13:40:13 +0100 Subject: [PATCH 11/11] fixing import name --- bin/node/cli/src/cli.rs | 6 +++--- bin/node/cli/src/factory_impl.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/node/cli/src/cli.rs b/bin/node/cli/src/cli.rs index 500e701f0af23..6e8afc613336a 100644 --- a/bin/node/cli/src/cli.rs +++ b/bin/node/cli/src/cli.rs @@ -24,7 +24,7 @@ use structopt::{StructOpt, clap::App}; use sc_cli::{display_role, parse_and_prepare, AugmentClap, GetLogFilter, ParseAndPrepare}; use crate::{service, ChainSpec, load_spec}; use crate::factory_impl::FactoryState; -use sc_transaction_factory::RuntimeAdapter; +use node_transaction_factory::RuntimeAdapter; /// Custom subcommands. #[derive(Clone, Debug, StructOpt)] @@ -70,7 +70,7 @@ pub struct FactoryCmd { /// /// These three modes control manufacturing. #[structopt(long="mode", default_value = "MasterToN")] - pub mode: sc_transaction_factory::Mode, + pub mode: node_transaction_factory::Mode, /// Number of transactions to generate. In mode `MasterNToNToM` this is /// the number of transactions per round. @@ -155,7 +155,7 @@ pub fn run(args: I, exit: E, version: sc_cli::VersionInfo) -> error::Re ); let service_builder = new_full_start!(config).0; - sc_transaction_factory::factory::, _, _, _, _, _>( + node_transaction_factory::factory::, _, _, _, _, _>( factory_state, service_builder.client(), service_builder.select_chain() diff --git a/bin/node/cli/src/factory_impl.rs b/bin/node/cli/src/factory_impl.rs index 780694a699b7e..b586337a2b232 100644 --- a/bin/node/cli/src/factory_impl.rs +++ b/bin/node/cli/src/factory_impl.rs @@ -32,8 +32,8 @@ use primitives::{sr25519, crypto::Pair}; use sp_runtime::{ generic::Era, traits::{Block as BlockT, Header as HeaderT, SignedExtension, Verify, IdentifyAccount} }; -use sc_transaction_factory::RuntimeAdapter; -use sc_transaction_factory::modes::Mode; +use node_transaction_factory::RuntimeAdapter; +use node_transaction_factory::modes::Mode; use inherents::InherentData; use sp_timestamp; use sp_finality_tracker;