Merge pull request #3024 from Pana/op/clientFolderStructure

Op/client folder structure

crates/client/src/lib.rs

@@ -10,12 +10,11 @@ use cfxkey as keylib;
 #[macro_use]
 mod config_macro;
 pub mod accounts;
-pub mod archive;
 pub mod common;
 pub mod configuration;
-pub mod full;
-pub mod light;
+mod node_types;
 pub mod rpc;
+pub use node_types::{archive, full, light};
 
 /// Used in Genesis author to indicate test-net/main-net version.
 /// Increased for every test-net/main-net release with reset.

crates/client/src/light/mod.rs → crates/client/src/node_types/light.rs

@@ -96,7 +96,7 @@ impl LightClient {
             data_man.clone(),
         ));
 
-        let debug_rpc_http_server = super::rpc::start_http(
+        let debug_rpc_http_server = crate::rpc::start_http(
             conf.local_http_config(),
             setup_debug_rpc_apis_light(
                 common_impl.clone(),
@@ -107,7 +107,7 @@ impl LightClient {
             ),
         )?;
 
-        let debug_rpc_tcp_server = super::rpc::start_tcp(
+        let debug_rpc_tcp_server = crate::rpc::start_tcp(
             conf.local_tcp_config(),
             setup_debug_rpc_apis_light(
                 common_impl.clone(),
@@ -119,7 +119,7 @@ impl LightClient {
             RpcExtractor,
         )?;
 
-        let rpc_tcp_server = super::rpc::start_tcp(
+        let rpc_tcp_server = crate::rpc::start_tcp(
             conf.tcp_config(),
             setup_public_rpc_apis_light(
                 common_impl.clone(),
@@ -131,7 +131,7 @@ impl LightClient {
             RpcExtractor,
         )?;
 
-        let debug_rpc_ws_server = super::rpc::start_ws(
+        let debug_rpc_ws_server = crate::rpc::start_ws(
             conf.local_ws_config(),
             setup_public_rpc_apis_light(
                 common_impl.clone(),
@@ -143,7 +143,7 @@ impl LightClient {
             RpcExtractor,
         )?;
 
-        let rpc_ws_server = super::rpc::start_ws(
+        let rpc_ws_server = crate::rpc::start_ws(
             conf.ws_config(),
             setup_public_rpc_apis_light(
                 common_impl.clone(),
@@ -155,7 +155,7 @@ impl LightClient {
             RpcExtractor,
         )?;
 
-        let rpc_http_server = super::rpc::start_http(
+        let rpc_http_server = crate::rpc::start_http(
             conf.http_config(),
             setup_public_rpc_apis_light(
                 common_impl,

crates/client/src/node_types/mod.rs

@@ -0,0 +1,3 @@
+pub mod archive;
+pub mod full;
+pub mod light;