diff --git a/src/service/btc.rs b/src/service/btc.rs index 7a99b5a52..e638819d7 100644 --- a/src/service/btc.rs +++ b/src/service/btc.rs @@ -9,7 +9,6 @@ use bitcoin::util::address::Address; use bitcoin::network::constants::Network; -use bitcoin::hash_types::PubkeyHash; // Swap out these types for any future non bitcoin-rs types pub type PubAddress = Address; diff --git a/src/service/cashier.rs b/src/service/cashier.rs index 77696a151..6078456cf 100644 --- a/src/service/cashier.rs +++ b/src/service/cashier.rs @@ -2,9 +2,9 @@ use super::reqrep::{PeerId, RepProtocol, Reply, ReqProtocol, Request}; use super::btc::{BitcoinKeys, PubAddress}; -use crate::{serial::deserialize, serial::serialize, Error, Result}; -use crate::serial::{Decodable, Encodable}; -use crate::wallet::{CashierDb, CashierDbPtr}; +use crate::{Error, Result}; +use crate::serial::{Decodable, Encodable, deserialize, serialize}; +use crate::wallet::CashierDbPtr; use crate::tx; use crate::crypto::load_params; @@ -120,7 +120,7 @@ impl CashierService { } async fn handle_request( msg: (PeerId, Request), - cashier_wallet: CashierDbPtr, + _cashier_wallet: CashierDbPtr, send_queue: async_channel::Sender<(PeerId, Reply)>, ) -> Result<()> { let request = msg.1; @@ -128,7 +128,7 @@ impl CashierService { match request.get_command() { 0 => { // Exchange zk_pubkey for bitcoin address - let zkpub = request.get_payload(); + let _zkpub = request.get_payload(); // Generate bitcoin Address let btc_keys = BitcoinKeys::new().unwrap(); diff --git a/src/wallet/cashierdb.rs b/src/wallet/cashierdb.rs index 2bfebd845..f235e6507 100644 --- a/src/wallet/cashierdb.rs +++ b/src/wallet/cashierdb.rs @@ -2,9 +2,7 @@ use crate::serial; use crate::serial::{deserialize, serialize, Decodable, Encodable}; use crate::util::join_config_path; use crate::{Error, Result}; -use crate::service::btc::{PrivKey, PubKey, PubAddress}; - -use secp256k1::key::SecretKey; +use crate::service::btc::{PrivKey, PubKey}; use async_std::sync::Arc; use ff::Field;