ソースを参照

run 'cargo fix'

ghassmo 5 年 前
コミット
c6dfd7edb4

+ 1 - 1
src/bin/cashierd.rs

@@ -40,7 +40,7 @@ async fn start(executor: Arc<Executor<'_>>, config: Arc<&CashierdConfig>) -> Res
     let cashier = CashierService::new(accept_addr, btc_endpoint, wallet.clone(), gateway)?;
     cashier.start(executor.clone()).await?;
 
-    let adapter = Arc::new(CashierAdapter::new(wallet.clone())?);
+    let _adapter = Arc::new(CashierAdapter::new(wallet.clone())?);
     Ok(())
 }
 

+ 1 - 1
src/bin/darkfid.rs

@@ -11,7 +11,7 @@ use drk::crypto::{
 };
 use drk::rpc::adapters::user_adapter::UserAdapter;
 use drk::rpc::jsonserver;
-use drk::serial::{deserialize, Decodable, Encodable};
+use drk::serial::{deserialize, Decodable};
 use drk::service::{CashierClient, GatewayClient, GatewaySlabsSubscriber};
 use drk::state::{state_transition, ProgramState, StateUpdate};
 use drk::util::{join_config_path, prepare_transaction};

+ 2 - 2
src/rpc/adapters/cashier_adapter.rs

@@ -1,7 +1,7 @@
 use crate::wallet::CashierDb;
-use crate::{Error, Result};
+use crate::{Result};
 use async_std::sync::Arc;
-use log::*;
+
 
 pub struct CashierAdapter {
     pub wallet: Arc<CashierDb>,

+ 5 - 5
src/service/btc.rs

@@ -1,4 +1,4 @@
-use crate::{Error, Result};
+use crate::{Result};
 
 use rand::distributions::Alphanumeric;
 use rand::{thread_rng, Rng};
@@ -8,12 +8,12 @@ use bitcoin::util::ecdsa::{PrivateKey, PublicKey};
 use secp256k1::key::SecretKey;
 
 use bitcoin::network::constants::Network;
-use electrum_client::{Client, ElectrumApi};
 
-use async_executor::Executor;
-use async_std::sync::Arc;
 
-use log::debug;
+
+
+
+
 
 // Swap out these types for any future non bitcoin-rs types
 pub type PubAddress = Address;

+ 4 - 4
src/service/cashier.rs

@@ -74,7 +74,7 @@ impl CashierService {
         let mut protocol = RepProtocol::new(self.addr.clone(), service_name.clone());
 
         let (send, recv) = protocol.start().await?;
-        let ex2 = executor.clone();
+        let _ex2 = executor.clone();
 
         let handle_request_task =
             executor.spawn(self.handle_request_loop(send.clone(), recv.clone(), executor.clone()));
@@ -88,9 +88,9 @@ impl CashierService {
 
     pub async fn subscribe_to_address(&self, script: Script) -> Result<()> {
         debug!(target: "BTC", "Subscribe");
-        let mut client = Client::new(&self.btc_endpoint).unwrap();
+        let client = Client::new(&self.btc_endpoint).unwrap();
 
-        let response = client.script_subscribe(&script).unwrap();
+        let _response = client.script_subscribe(&script).unwrap();
 
         Ok(())
     }
@@ -158,7 +158,7 @@ impl CashierService {
         msg: (PeerId, Request),
         cashier_wallet: CashierDbPtr,
         send_queue: async_channel::Sender<(PeerId, Reply)>,
-        executor: Arc<Executor<'_>>,
+        _executor: Arc<Executor<'_>>,
     ) -> Result<()> {
         let request = msg.1;
         let peer = msg.0;

+ 1 - 1
src/util.rs

@@ -26,7 +26,7 @@ pub fn join_config_path(file: &PathBuf) -> Result<PathBuf> {
 }
 
 pub fn prepare_transaction(
-    state: &dyn ProgramState,
+    _state: &dyn ProgramState,
     secret: jubjub::Fr,
     mint_params: bellman::groth16::Parameters<Bls12>,
     spend_params: bellman::groth16::Parameters<Bls12>,