From 3d0a44c8a985823b8a94eee8cdc026ef749fb37c Mon Sep 17 00:00:00 2001 From: Gav Date: Wed, 7 Feb 2018 22:59:35 +0100 Subject: [PATCH] Moving rpc to substrate in name. --- substrate/Cargo.lock | 48 ++++++++++++++++---------------- substrate/cli/Cargo.toml | 2 +- substrate/cli/src/lib.rs | 2 +- substrate/client/src/Cargo.toml | 2 +- substrate/rpc-servers/Cargo.toml | 4 +-- substrate/rpc-servers/src/lib.rs | 12 ++++---- substrate/rpc/Cargo.toml | 2 +- substrate/rpc/src/chain/error.rs | 8 +++--- substrate/rpc/src/chain/mod.rs | 10 +++---- substrate/rpc/src/chain/tests.rs | 8 +++--- substrate/rpc/src/lib.rs | 10 +++---- substrate/rpc/src/state/error.rs | 8 +++--- substrate/rpc/src/state/mod.rs | 8 +++--- substrate/rpc/src/state/tests.rs | 10 +++---- 14 files changed, 67 insertions(+), 67 deletions(-) diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock index 1c30e4f727..fcea094542 100644 --- a/substrate/Cargo.lock +++ b/substrate/Cargo.lock @@ -994,11 +994,11 @@ dependencies = [ "native-runtime 0.1.0", "polkadot-executor 0.1.0", "polkadot-primitives 0.1.0", - "polkadot-rpc-servers 0.1.0", "substrate-client 0.1.0", "substrate-codec 0.1.0", "substrate-executor 0.1.0", "substrate-primitives 0.1.0", + "substrate-rpc-servers 0.1.0", "substrate-runtime-io 0.1.0", "substrate-state-machine 0.1.0", "triehash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1068,29 +1068,6 @@ dependencies = [ "substrate-serializer 0.1.0", ] -[[package]] -name = "polkadot-rpc" -version = "0.1.0" -dependencies = [ - "assert_matches 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git)", - "jsonrpc-macros 8.0.0 (git+https://github.com/paritytech/jsonrpc.git)", - "substrate-client 0.1.0", - "substrate-executor 0.1.0", - "substrate-primitives 0.1.0", - "substrate-state-machine 0.1.0", -] - -[[package]] -name = "polkadot-rpc-servers" -version = "0.1.0" -dependencies = [ - "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git)", - "jsonrpc-http-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git)", - "polkadot-rpc 0.1.0", -] - [[package]] name = "polkadot-validator" version = "0.1.0" @@ -1484,6 +1461,29 @@ dependencies = [ "uint 0.1.2 (git+https://github.com/rphmeier/primitives.git?branch=compile-for-wasm)", ] +[[package]] +name = "substrate-rpc" +version = "0.1.0" +dependencies = [ + "assert_matches 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git)", + "jsonrpc-macros 8.0.0 (git+https://github.com/paritytech/jsonrpc.git)", + "substrate-client 0.1.0", + "substrate-executor 0.1.0", + "substrate-primitives 0.1.0", + "substrate-state-machine 0.1.0", +] + +[[package]] +name = "substrate-rpc-servers" +version = "0.1.0" +dependencies = [ + "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git)", + "jsonrpc-http-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git)", + "substrate-rpc 0.1.0", +] + [[package]] name = "substrate-runtime-io" version = "0.1.0" diff --git a/substrate/cli/Cargo.toml b/substrate/cli/Cargo.toml index aa8989d2af..794efd7358 100644 --- a/substrate/cli/Cargo.toml +++ b/substrate/cli/Cargo.toml @@ -18,7 +18,7 @@ substrate-runtime-io = { path = "../runtime-io" } substrate-state-machine = { path = "../state-machine" } substrate-executor = { path = "../executor" } substrate-primitives = { path = "../primitives" } -polkadot-rpc-servers = { path = "../rpc-servers" } +substrate-rpc-servers = { path = "../rpc-servers" } polkadot-primitives = { path = "../polkadot-primitives" } polkadot-executor = { path = "../polkadot-executor" } native-runtime = { path = "../native-runtime" } diff --git a/substrate/cli/src/lib.rs b/substrate/cli/src/lib.rs index 67803bb74b..5f4246763c 100644 --- a/substrate/cli/src/lib.rs +++ b/substrate/cli/src/lib.rs @@ -26,7 +26,7 @@ extern crate substrate_state_machine as state_machine; extern crate substrate_client as client; extern crate substrate_primitives as primitives; extern crate substrate_runtime_io as runtime_io; -extern crate polkadot_rpc_servers as rpc; +extern crate substrate_rpc_servers as rpc; extern crate polkadot_primitives; extern crate polkadot_executor; extern crate native_runtime; diff --git a/substrate/client/src/Cargo.toml b/substrate/client/src/Cargo.toml index aa8989d2af..794efd7358 100644 --- a/substrate/client/src/Cargo.toml +++ b/substrate/client/src/Cargo.toml @@ -18,7 +18,7 @@ substrate-runtime-io = { path = "../runtime-io" } substrate-state-machine = { path = "../state-machine" } substrate-executor = { path = "../executor" } substrate-primitives = { path = "../primitives" } -polkadot-rpc-servers = { path = "../rpc-servers" } +substrate-rpc-servers = { path = "../rpc-servers" } polkadot-primitives = { path = "../polkadot-primitives" } polkadot-executor = { path = "../polkadot-executor" } native-runtime = { path = "../native-runtime" } diff --git a/substrate/rpc-servers/Cargo.toml b/substrate/rpc-servers/Cargo.toml index d47b4d94a1..e242664da3 100644 --- a/substrate/rpc-servers/Cargo.toml +++ b/substrate/rpc-servers/Cargo.toml @@ -1,9 +1,9 @@ [package] -name = "polkadot-rpc-servers" +name = "substrate-rpc-servers" version = "0.1.0" authors = ["Parity Technologies "] [dependencies] -polkadot-rpc = { path = "../rpc", version = "0.1" } +substrate-rpc = { path = "../rpc", version = "0.1" } jsonrpc-core = { git="https://github.com/paritytech/jsonrpc.git" } jsonrpc-http-server = { git="https://github.com/paritytech/jsonrpc.git" } diff --git a/substrate/rpc-servers/src/lib.rs b/substrate/rpc-servers/src/lib.rs index 2bc78a06f2..cf2f6f2dc1 100644 --- a/substrate/rpc-servers/src/lib.rs +++ b/substrate/rpc-servers/src/lib.rs @@ -1,24 +1,24 @@ // Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . -//! Polkadot RPC servers. +//! Substrate RPC servers. #[warn(missing_docs)] -extern crate polkadot_rpc as apis; +extern crate substrate_rpc as apis; extern crate jsonrpc_core as rpc; extern crate jsonrpc_http_server as http; diff --git a/substrate/rpc/Cargo.toml b/substrate/rpc/Cargo.toml index c2c9ebce2f..149199546e 100644 --- a/substrate/rpc/Cargo.toml +++ b/substrate/rpc/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "polkadot-rpc" +name = "substrate-rpc" version = "0.1.0" authors = ["Parity Technologies "] diff --git a/substrate/rpc/src/chain/error.rs b/substrate/rpc/src/chain/error.rs index a838f30787..fb55a643ea 100644 --- a/substrate/rpc/src/chain/error.rs +++ b/substrate/rpc/src/chain/error.rs @@ -1,18 +1,18 @@ // Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . use rpc; diff --git a/substrate/rpc/src/chain/mod.rs b/substrate/rpc/src/chain/mod.rs index 519bdefb4a..473b53aff0 100644 --- a/substrate/rpc/src/chain/mod.rs +++ b/substrate/rpc/src/chain/mod.rs @@ -1,20 +1,20 @@ // Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . -//! Polkadot blockchain API. +//! Substrate blockchain API. use primitives::block; use client; diff --git a/substrate/rpc/src/chain/tests.rs b/substrate/rpc/src/chain/tests.rs index 9fa60de3a8..c62981094c 100644 --- a/substrate/rpc/src/chain/tests.rs +++ b/substrate/rpc/src/chain/tests.rs @@ -1,18 +1,18 @@ // Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . use substrate_executor as executor; use client; diff --git a/substrate/rpc/src/lib.rs b/substrate/rpc/src/lib.rs index cb7cae10cd..05d3d94685 100644 --- a/substrate/rpc/src/lib.rs +++ b/substrate/rpc/src/lib.rs @@ -1,20 +1,20 @@ // Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . -//! Polkadot RPC interfaces. +//! Substrate RPC interfaces. #![warn(missing_docs)] diff --git a/substrate/rpc/src/state/error.rs b/substrate/rpc/src/state/error.rs index 827ac9e8ca..57db7d18fe 100644 --- a/substrate/rpc/src/state/error.rs +++ b/substrate/rpc/src/state/error.rs @@ -1,18 +1,18 @@ // Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . use client; use rpc; diff --git a/substrate/rpc/src/state/mod.rs b/substrate/rpc/src/state/mod.rs index b21b859435..2549f86a85 100644 --- a/substrate/rpc/src/state/mod.rs +++ b/substrate/rpc/src/state/mod.rs @@ -1,18 +1,18 @@ // Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . //! Polkadot state API. diff --git a/substrate/rpc/src/state/tests.rs b/substrate/rpc/src/state/tests.rs index 7589c3084b..687c851c5c 100644 --- a/substrate/rpc/src/state/tests.rs +++ b/substrate/rpc/src/state/tests.rs @@ -1,21 +1,21 @@ // Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . -use substrate_executor as executor; use super::*; +use substrate_executor as executor; use self::error::{Error, ErrorKind}; use client;