Move rpc/api back to client, move palette/support/rpc into utils

Cargo.lock

@@ -3180,22 +3180,6 @@ dependencies = [
  "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "palette-support-rpc"
-version = "2.0.0"
-dependencies = [
- "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-client-transports 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "palette-support 2.0.0",
- "palette-system 2.0.0",
- "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-rpc-api 2.0.0",
- "substrate-primitives-storage 2.0.0",
- "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "palette-support-test"
 version = "2.0.0"
@@ -4734,6 +4718,27 @@ dependencies = [
  "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "sc-rpc-api"
+version = "2.0.0"
+dependencies = [
+ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-derive 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-pubsub 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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)",
+ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-transaction-graph 2.0.0",
+ "sr-version 2.0.0",
+ "substrate-primitives 2.0.0",
+ "substrate-rpc-primitives 2.0.0",
+]
+
 [[package]]
 name = "schannel"
 version = "0.1.16"
@@ -5055,27 +5060,6 @@ dependencies = [
  "substrate-inherents 2.0.0",
 ]
 
-[[package]]
-name = "sp-rpc-api"
-version = "2.0.0"
-dependencies = [
- "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-derive 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-pubsub 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "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)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-transaction-graph 2.0.0",
- "sr-version 2.0.0",
- "substrate-primitives 2.0.0",
- "substrate-rpc-primitives 2.0.0",
-]
-
 [[package]]
 name = "sp-timestamp"
 version = "2.0.0"
@@ -6059,6 +6043,22 @@ dependencies = [
  "sr-primitives 2.0.0",
 ]
 
+[[package]]
+name = "substrate-palette-rpc"
+version = "2.0.0"
+dependencies = [
+ "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-client-transports 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "palette-support 2.0.0",
+ "palette-system 2.0.0",
+ "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sc-rpc-api 2.0.0",
+ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
+ "substrate-primitives-storage 2.0.0",
+ "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "substrate-panic-handler"
 version = "2.0.0"
@@ -6159,7 +6159,6 @@ dependencies = [
  "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
  "sp-blockchain 2.0.0",
- "sp-rpc-api 2.0.0",
  "sp-transaction-pool 2.0.0",
  "sr-api 2.0.0",
  "sr-io 2.0.0",
@@ -6170,6 +6169,7 @@ dependencies = [
  "substrate-executor 2.0.0",
  "substrate-keystore 2.0.0",
  "substrate-network 2.0.0",
+ "substrate-palette-rpc 2.0.0",
  "substrate-primitives 2.0.0",
  "substrate-rpc-primitives 2.0.0",
  "substrate-session 2.0.0",

Cargo.toml

@@ -33,6 +33,7 @@ members = [
 	"client/peerset",
 	"client/rpc-servers",
 	"client/rpc",
+	"client/rpc/api",
 	"client/service",
 	"client/service/test",
 	"client/state-db",
@@ -73,7 +74,6 @@ members = [
 	"palette/support/procedural",
 	"palette/support/procedural/tools",
 	"palette/support/procedural/tools/derive",
-	"palette/support/rpc",
 	"palette/support/test",
 	"palette/system",
 	"palette/system/rpc",
@@ -105,7 +105,6 @@ members = [
 	"primitives/panic-handler",
 	"primitives/phragmen",
 	"primitives/rpc",
-	"primitives/rpc/api",
 	"primitives/runtime-interface",
 	"primitives/runtime-interface/proc-macro",
 	"primitives/runtime-interface/test-wasm",
@@ -136,6 +135,7 @@ members = [
 	"test/utils/transaction-factory",
 	"utils/build-script-utils",
 	"utils/fork-tree",
+	"utils/palette/rpc",
 	"utils/wasm-builder",
 ]
 

client/rpc/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-api = { package = "sp-rpc-api", path = "../../primitives/rpc/api" }
+api = { package = "substrate-palette-rpc", path = "../../utils/palette/rpc" }
 client-api = { package = "substrate-client-api", path = "../api" }
 client = { package = "substrate-client", path = "../" }
 sr-api = { path = "../../primitives/sr-api" }

primitives/rpc/api/Cargo.toml → client/rpc/api/Cargo.toml

 [package]
-name = "sp-rpc-api"
+name = "sc-rpc-api"
 version = "2.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -14,9 +14,9 @@ jsonrpc-derive = "14.0.3"
 jsonrpc-pubsub = "14.0.3"
 log = "0.4.8"
 parking_lot = "0.9.0"
-primitives = { package = "substrate-primitives", path = "../../core" }
-runtime_version = { package = "sr-version", path = "../../sr-version" }
+primitives = { package = "substrate-primitives", path = "../../../primitives/core" }
+runtime_version = { package = "sr-version", path = "../../../primitives/sr-version" }
 serde = { version = "1.0.101", features = ["derive"] }
 serde_json = "1.0.41"
-txpool = { package = "sp-transaction-graph", path = "../../transaction-pool/graph" }
-rpc-primitives = { package = "substrate-rpc-primitives", path = "../" }
+txpool = { package = "sp-transaction-graph", path = "../../../primitives/transaction-pool/graph" }
+rpc-primitives = { package = "substrate-rpc-primitives", path = "../../../primitives/rpc" }

palette/support/rpc/Cargo.toml → utils/palette/rpc/Cargo.toml

 [package]
-name = "palette-support-rpc"
+name = "substrate-palette-rpc"
 version = "2.0.0"
 authors = ["Parity Technologies <admin@parity.io>", "Andrew Dirksen <andrew@dirksen.com>"]
 edition = "2018"
@@ -10,10 +10,10 @@ jsonrpc-client-transports = "14"
 jsonrpc-core = "14"
 parity-scale-codec = "1"
 serde = "1"
-palette-support = { path = "../" }
+palette-support = { path = "../../../palette/support" }
 substrate-primitives-storage = { path = "../../../primitives/core/storage" }
-sp-rpc-api = { path = "../../../primitives/rpc/api" }
+sc-rpc-api = { path = "../../../client/rpc/api" }
 
 [dev-dependencies]
-palette-system = { path = "../../system" }
+palette-system = { path = "../../../palette/system" }
 tokio = "0.1"