Improve fc-rpc (#593)

* Split net api and web3 api into their own modules Signed-off-by: koushiro <koushiro.cqx@gmail.com> * some nits Signed-off-by: koushiro <koushiro.cqx@gmail.com> * remove some useless trait bound Signed-off-by: koushiro <koushiro.cqx@gmail.com>
polkadot-evm · Mar 3, 2022 · d42806d · d42806d
1 parent 37a1dc0
commit d42806d
Show file tree

Hide file tree

Showing 11 changed files with 275 additions and 269 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/rpc-core/src/eth.rs b/client/rpc-core/src/eth.rs
@@ -26,6 +26,7 @@ use crate::types::{
 	BlockNumber, Bytes, CallRequest, FeeHistory, Filter, FilterChanges, Index, Log, Receipt,
 	RichBlock, SyncStatus, Transaction, TransactionRequest, Work,
 };
+
 pub use rpc_impl_EthApi::gen_server::EthApi as EthApiServer;
 pub use rpc_impl_EthFilterApi::gen_server::EthFilterApi as EthFilterApiServer;
 

diff --git a/client/rpc-core/src/lib.rs b/client/rpc-core/src/lib.rs
@@ -23,7 +23,9 @@ mod eth_pubsub;
 mod net;
 mod web3;
 
-pub use eth::{EthApi, EthApiServer, EthFilterApi, EthFilterApiServer};
-pub use eth_pubsub::{EthPubSubApi, EthPubSubApiServer};
-pub use net::{NetApi, NetApiServer};
-pub use web3::{Web3Api, Web3ApiServer};
+pub use self::{
+	eth::{EthApi, EthApiServer, EthFilterApi, EthFilterApiServer},
+	eth_pubsub::{EthPubSubApi, EthPubSubApiServer},
+	net::{NetApi, NetApiServer},
+	web3::{Web3Api, Web3ApiServer},
+};
diff --git a/client/rpc-core/src/net.rs b/client/rpc-core/src/net.rs
@@ -17,10 +17,12 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Net rpc interface.
-use crate::types::PeerCount;
+
 use jsonrpc_core::Result;
 use jsonrpc_derive::rpc;
 
+use crate::types::PeerCount;
+
 pub use rpc_impl_NetApi::gen_server::NetApi as NetApiServer;
 
 /// Net rpc interface.

diff --git a/client/rpc-core/src/web3.rs b/client/rpc-core/src/web3.rs
@@ -17,6 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 //! Web3 rpc interface.
+
 use ethereum_types::H256;
 use jsonrpc_core::Result;
 use jsonrpc_derive::rpc;

diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
@@ -20,22 +20,22 @@ jsonrpc-core-client = "18.0"
 jsonrpc-pubsub = "18.0"
 rand = "0.8"
 rlp = "0.5"
-sha3 = "0.10"
 tokio = { version = "1.14", features = [ "sync" ] }
 
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sp-api = { version = "4.0.0-dev",  git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-blockchain = { version = "4.0.0-dev",  git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-block-builder = { version = "4.0.0-dev",  git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { version = "5.0.0", git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-io = { version = "5.0.0",  git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-runtime = { version = "5.0.0",  git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-storage = { version = "5.0.0",  git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-client-api = { version = "4.0.0-dev",  git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-network = { version = "0.10.0-dev",  git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-rpc = { version = "4.0.0-dev",  git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-service = { version = "0.10.0-dev",  git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-transaction-pool = { version = "4.0.0-dev",  git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-transaction-pool-api = { version = "4.0.0-dev",  git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-runtime = { version = "5.0.0", git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-storage = { version = "5.0.0", git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-client-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-network = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-rpc = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-service = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
 
 fp-rpc = { version = "3.0.0-dev", path = "../../primitives/rpc" }
 fp-storage = { version = "2.0.0-dev", path = "../../primitives/storage" }