From 40d7f8e6a4d2ea73dfce02907069d9807c097843 Mon Sep 17 00:00:00 2001 From: cheme Date: Mon, 7 Mar 2022 16:12:55 +0100 Subject: [PATCH] move rpc crate --- Cargo.lock | 32 +++++++++---------- Cargo.toml | 2 +- bin/node/rpc/Cargo.toml | 2 +- .../state-trie-migration-rpc}/Cargo.toml | 8 ++--- .../state-trie-migration-rpc}/README.md | 0 .../state-trie-migration-rpc}/src/lib.rs | 0 6 files changed, 22 insertions(+), 22 deletions(-) rename {frame/state-trie-migration/rpc => client/state-trie-migration-rpc}/Cargo.toml (71%) rename {frame/state-trie-migration/rpc => client/state-trie-migration-rpc}/README.md (100%) rename {frame/state-trie-migration/rpc => client/state-trie-migration-rpc}/src/lib.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 34e68ad930efc..283965ba6f16e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4936,7 +4936,6 @@ dependencies = [ "node-primitives", "pallet-contracts-rpc", "pallet-mmr-rpc", - "pallet-state-trie-migration-rpc", "pallet-transaction-payment-rpc", "sc-chain-spec", "sc-client-api", @@ -4947,6 +4946,7 @@ dependencies = [ "sc-finality-grandpa-rpc", "sc-rpc", "sc-rpc-api", + "sc-state-trie-migration-rpc", "sc-sync-state-rpc", "sc-transaction-pool-api", "sp-api", @@ -6447,21 +6447,6 @@ dependencies = [ "zstd", ] -[[package]] -name = "pallet-state-trie-migration-rpc" -version = "4.0.0-dev" -dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "parity-scale-codec", - "sc-client-api", - "sc-rpc-api", - "serde", - "serde_json", - "sp-runtime", -] - [[package]] name = "pallet-sudo" version = "4.0.0-dev" @@ -9001,6 +8986,21 @@ dependencies = [ "sp-core", ] +[[package]] +name = "sc-state-trie-migration-rpc" +version = "4.0.0-dev" +dependencies = [ + "jsonrpc-core", + "jsonrpc-core-client", + "jsonrpc-derive", + "parity-scale-codec", + "sc-client-api", + "sc-rpc-api", + "serde", + "serde_json", + "sp-runtime", +] + [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" diff --git a/Cargo.toml b/Cargo.toml index df21ee542767e..3b119fd0881a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,6 +54,7 @@ members = [ "client/service", "client/service/test", "client/state-db", + "client/state-trie-migration-rpc", "client/sync-state-rpc", "client/telemetry", "client/tracing", @@ -118,7 +119,6 @@ members = [ "frame/staking/reward-curve", "frame/staking/reward-fn", "frame/state-trie-migration", - "frame/state-trie-migration/rpc", "frame/sudo", "frame/support", "frame/support/procedural", diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml index 451badbc9ddda..cb34500b137f5 100644 --- a/bin/node/rpc/Cargo.toml +++ b/bin/node/rpc/Cargo.toml @@ -16,7 +16,6 @@ node-primitives = { version = "2.0.0", path = "../primitives" } pallet-contracts-rpc = { version = "4.0.0-dev", path = "../../../frame/contracts/rpc/" } pallet-mmr-rpc = { version = "3.0.0", path = "../../../frame/merkle-mountain-range/rpc/" } pallet-transaction-payment-rpc = { version = "4.0.0-dev", path = "../../../frame/transaction-payment/rpc/" } -pallet-state-trie-migration-rpc = { version = "4.0.0-dev", path = "../../../frame/state-trie-migration/rpc/" } sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" } sc-consensus-babe = { version = "0.10.0-dev", path = "../../../client/consensus/babe" } sc-consensus-babe-rpc = { version = "0.10.0-dev", path = "../../../client/consensus/babe/rpc" } @@ -26,6 +25,7 @@ sc-finality-grandpa = { version = "0.10.0-dev", path = "../../../client/finality sc-finality-grandpa-rpc = { version = "0.10.0-dev", path = "../../../client/finality-grandpa/rpc" } sc-rpc-api = { version = "0.10.0-dev", path = "../../../client/rpc-api" } sc-rpc = { version = "4.0.0-dev", path = "../../../client/rpc" } +sc-state-trie-migration-rpc = { version = "4.0.0-dev", path = "../../../client/state-trie-migration-rpc/" } sc-sync-state-rpc = { version = "0.10.0-dev", path = "../../../client/sync-state-rpc" } sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" } sp-block-builder = { version = "4.0.0-dev", path = "../../../primitives/block-builder" } diff --git a/frame/state-trie-migration/rpc/Cargo.toml b/client/state-trie-migration-rpc/Cargo.toml similarity index 71% rename from frame/state-trie-migration/rpc/Cargo.toml rename to client/state-trie-migration-rpc/Cargo.toml index 1b9fbc820bac0..035bd12c932ad 100644 --- a/frame/state-trie-migration/rpc/Cargo.toml +++ b/client/state-trie-migration-rpc/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "pallet-state-trie-migration-rpc" +name = "sc-state-trie-migration-rpc" version = "4.0.0-dev" authors = ["Parity Technologies "] edition = "2021" @@ -20,9 +20,9 @@ jsonrpc-derive = "18.0.0" serde = { version = "1", features = ["derive"] } # Substrate Dependencies -sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" } -sc-rpc-api = { version = "0.10.0-dev", path = "../../../client/rpc-api" } -sp-runtime = { version = "6.0.0", path = "../../../primitives/runtime" } +sc-client-api = { version = "4.0.0-dev", path = "../api" } +sc-rpc-api = { version = "0.10.0-dev", path = "../rpc-api" } +sp-runtime = { version = "6.0.0", path = "../../primitives/runtime" } [dev-dependencies] serde_json = "1" diff --git a/frame/state-trie-migration/rpc/README.md b/client/state-trie-migration-rpc/README.md similarity index 100% rename from frame/state-trie-migration/rpc/README.md rename to client/state-trie-migration-rpc/README.md diff --git a/frame/state-trie-migration/rpc/src/lib.rs b/client/state-trie-migration-rpc/src/lib.rs similarity index 100% rename from frame/state-trie-migration/rpc/src/lib.rs rename to client/state-trie-migration-rpc/src/lib.rs