moved /rpc to /util/rpc

bin/cashier/src/main.rs

@@ -23,13 +23,19 @@ use darkfi::{
         state::State,
         wallet::{cashierdb::CashierDb, walletdb::WalletDb},
     },
-    rpc::{
-        jsonrpc::{error as jsonerr, response as jsonresp, ErrorCode::*, JsonRequest, JsonResult},
-        rpcserver::{listen_and_serve, RequestHandler, RpcServerConfig},
-    },
     serial::serialize,
     types::DrkTokenId,
-    util::{expand_path, generate_id2, join_config_path, parse::truncate, Address, NetworkName},
+    util::{
+        expand_path, generate_id2, join_config_path,
+        parse::truncate,
+        rpc::{
+            jsonrpc::{
+                error as jsonerr, response as jsonresp, ErrorCode::*, JsonRequest, JsonResult,
+            },
+            rpcserver::{listen_and_serve, RequestHandler, RpcServerConfig},
+        },
+        Address, NetworkName,
+    },
     Error, Result,
 };
 

bin/cashier/src/service/btc.rs

@@ -43,9 +43,9 @@ use secp256k1::{
 use super::bridge::{NetworkClient, TokenNotification, TokenSubscribtion};
 use darkfi::{
     crypto::keypair::PublicKey as DrkPublicKey,
+    node::wallet::cashierdb::{CashierDb, TokenKey},
     serial::{deserialize, serialize, Decodable, Encodable},
     util::{expand_path, generate_id2, load_keypair_to_str, NetworkName},
-    node::wallet::cashierdb::{CashierDb, TokenKey},
     Error, Result,
 };
 

bin/cashier/src/service/eth.rs

@@ -15,10 +15,10 @@ use super::bridge::{NetworkClient, TokenNotification, TokenSubscribtion};
 
 use darkfi::{
     crypto::keypair::PublicKey,
+    node::wallet::cashierdb::{CashierDb, TokenKey},
     rpc::{jsonrpc, jsonrpc::JsonResult},
     serial::{deserialize, serialize, Decodable, Encodable},
     util::{generate_id2, parse::truncate, sleep, NetworkName},
-    node::wallet::cashierdb::{CashierDb, TokenKey},
     Error, Result,
 };
 

bin/cashier/src/service/sol.rs

@@ -25,10 +25,10 @@ use super::bridge::{NetworkClient, TokenNotification, TokenSubscribtion};
 
 use darkfi::{
     crypto::keypair::PublicKey,
+    node::wallet::cashierdb::{CashierDb, TokenKey},
     rpc::{jsonrpc, jsonrpc::JsonResult, websockets, websockets::WsStream},
     serial::{deserialize, serialize, Decodable, Encodable},
     util::{expand_path, generate_id2, load_keypair_to_str, parse::truncate, sleep, NetworkName},
-    node::wallet::cashierdb::{CashierDb, TokenKey},
     Error, Result,
 };
 

bin/darkfid/src/main.rs

@@ -24,17 +24,17 @@ use darkfi::{
         state::{ProgramState, State},
         wallet::walletdb::WalletDb,
     },
-    rpc::{
-        jsonrpc::{
-            error as jsonerr, request as jsonreq, response as jsonresp, send_raw_request,
-            ErrorCode::*, JsonRequest, JsonResult,
-        },
-        rpcserver::{listen_and_serve, RequestHandler, RpcServerConfig},
-    },
     types::DrkTokenId,
     util::{
-        assign_id, decode_base10, encode_base10, expand_path, join_config_path, Address,
-        DrkTokenList, NetworkName, TokenList,
+        assign_id, decode_base10, encode_base10, expand_path, join_config_path,
+        rpc::{
+            jsonrpc::{
+                error as jsonerr, request as jsonreq, response as jsonresp, send_raw_request,
+                ErrorCode::*, JsonRequest, JsonResult,
+            },
+            rpcserver::{listen_and_serve, RequestHandler, RpcServerConfig},
+        },
+        Address, DrkTokenList, NetworkName, TokenList,
     },
     Error, Result,
 };

bin/drk/src/main.rs

@@ -10,8 +10,12 @@ use simplelog::{ColorChoice, LevelFilter, TermLogger, TerminalMode};
 
 use darkfi::{
     cli::{CliDrk, CliDrkSubCommands, Config, DrkConfig},
-    rpc::{jsonrpc, jsonrpc::JsonResult},
-    util::{join_config_path, path::expand_path, NetworkName},
+    util::{
+        join_config_path,
+        path::expand_path,
+        rpc::{jsonrpc, jsonrpc::JsonResult},
+        NetworkName,
+    },
     Error, Result,
 };
 
@@ -377,4 +381,3 @@ async fn main() -> Result<()> {
 
     start(&config, args).await
 }
-

src/lib.rs

@@ -2,7 +2,7 @@ pub mod circuit;
 pub mod cli;
 pub mod crypto;
 pub mod net;
-pub mod rpc;
+//pub mod rpc;
 pub mod system;
 pub mod types;
 pub mod zk;

src/util/mod.rs

@@ -9,6 +9,7 @@ pub mod parse;
 pub mod path;
 pub mod serial;
 pub mod token_list;
+pub mod rpc;
 
 pub use async_util::sleep;
 pub use loader::ContractLoader;

src/rpc/rpcserver.rs → src/util/rpc/rpcserver.rs

@@ -14,7 +14,7 @@ use smol::{
 };
 
 use crate::{
-    rpc::jsonrpc::{JsonRequest, JsonResult},
+    util::rpc::jsonrpc::{JsonRequest, JsonResult},
     Result,
 };