Просмотр исходного кода

remove dependencies from the old rpc

ghassmo 4 лет назад
Родитель
Сommit
60e416af4b
3 измененных файлов с 3 добавлено и 30 удалено
  1. 1 27
      src/client/client.rs
  2. 1 1
      src/rpc/mod.rs
  3. 1 2
      src/service/mod.rs

+ 1 - 27
src/client/client.rs

@@ -7,11 +7,9 @@ use crate::crypto::{
     nullifier::Nullifier,
     save_params, setup_mint_prover, setup_spend_prover, OwnCoin,
 };
-use crate::rpc::adapter::{RpcClient, RpcClientAdapter};
-use crate::rpc::jsonserver;
 use crate::serial::Decodable;
 use crate::serial::Encodable;
-use crate::service::{CashierClient, GatewayClient, GatewaySlabsSubscriber};
+use crate::service::{GatewayClient, GatewaySlabsSubscriber};
 use crate::state::{state_transition, ProgramState, StateUpdate};
 use crate::wallet::{CashierDbPtr, WalletPtr};
 use crate::{tx, Result};
@@ -22,8 +20,6 @@ use async_executor::Executor;
 use bellman::groth16;
 use bls12_381::Bls12;
 
-use jsonrpc_core::IoHandler;
-
 use async_std::sync::{Arc, Mutex};
 use log::*;
 use std::net::SocketAddr;
@@ -93,30 +89,8 @@ impl Client {
     pub async fn connect_to_cashier(
         client: Client,
         executor: Arc<Executor<'_>>,
-        cashier_addr: SocketAddr,
-        rpc_url: SocketAddr,
     ) -> Result<()> {
-        // create cashier client
-        debug!(target: "CLIENT", "Creating cashier client");
-        let mut cashier_client = CashierClient::new(cashier_addr)?;
-
-        // start cashier_client
-        cashier_client.start().await?;
-
         let client_mutex = Arc::new(Mutex::new(client));
-        let cashier_mutex = Arc::new(Mutex::new(cashier_client));
-
-        let mut io = IoHandler::new();
-
-        let rpc_client_adapter = RpcClientAdapter::new(client_mutex.clone(), cashier_mutex.clone());
-
-        io.extend_with(rpc_client_adapter.to_delegate());
-
-        let io = Arc::new(io);
-
-        // start the rpc server
-        debug!(target: "CLIENT", "Start RPC server");
-        let _ = jsonserver::start(executor.clone(), rpc_url, io).await?;
 
         // start subscriber
         Client::connect_to_subscriber(client_mutex.clone(), executor.clone()).await?;

+ 1 - 1
src/rpc/mod.rs

@@ -1,3 +1,3 @@
-pub mod adapter;
+// pub mod adapter;
 pub mod jsonrpc;
 pub mod jsonserver;

+ 1 - 2
src/service/mod.rs

@@ -1,4 +1,4 @@
-pub mod cashier;
+//pub mod cashier;
 pub mod gateway;
 pub mod reqrep;
 pub mod bridge;
@@ -15,5 +15,4 @@ pub use sol::{SolClient, SolFailed, SolResult};
 
 pub use gateway::{GatewayClient, GatewayService, GatewaySlabsSubscriber};
 
-pub use cashier::{CashierClient, CashierService};