Remove unused code and correct some warnings

src/bin/cashierd.rs

@@ -1,11 +1,8 @@
 use std::net::SocketAddr;
-use std::str;
 use std::sync::Arc;
 
-use std::fs::OpenOptions;
-use std::io::Read;
-use std::{fs, path::Path, path::PathBuf};
-use toml;
+use std::{path::Path, path::PathBuf};
+//use toml;
 
 use drk::blockchain::{rocks::columns, Rocks, RocksColumn};
 use drk::cli::{CashierdCli, CashierdConfig};
@@ -18,13 +15,6 @@ use drk::Result;
 use async_executor::Executor;
 use easy_parallel::Parallel;
 
-fn setup_addr(address: Option<SocketAddr>, default: SocketAddr) -> SocketAddr {
-    match address {
-        Some(addr) => addr,
-        None => default,
-    }
-}
-
 async fn start(executor: Arc<Executor<'_>>, config: Arc<&CashierdConfig>) -> Result<()> {
     let accept_addr: SocketAddr = config.accept_url.parse()?;
 
@@ -35,8 +25,7 @@ async fn start(executor: Arc<Executor<'_>>, config: Arc<&CashierdConfig>) -> Res
     let rocks = Rocks::new(&database_path)?;
 
     let rocks_cashierstore_column = RocksColumn::<columns::CashierKeys>::new(rocks);
-    // Use pw: PASSWORD for now
-    //let cashier_wallet = Arc::new(WalletDB::new("cashier.db", "PASSWORD")?);
+
     let wallet = Arc::new(WalletDb::new("cashier.db", config.password.clone())?);
 
     let cashier = CashierService::new(accept_addr, rocks_cashierstore_column, wallet)?;

src/blockchain/cashierstore.rs

@@ -23,7 +23,7 @@ impl CashierStore {
     pub fn put(&self, keypair: CashierKeypair) -> Result<Option<jubjub::SubgroupPoint>> {
 
         let index = keypair.get_index();
-        let check = self.get(index);
+
         match self.get(index) {
             Ok(_v) => Ok(None),
             Err(_e) => {

src/service/bitcoin_bridge.rs

@@ -1,10 +1,9 @@
 use rand::{thread_rng, Rng};
 use rand::distributions::Alphanumeric;
-use secp256k1::key::{SecretKey, PublicKey};
+use secp256k1::key::SecretKey;
 use bitcoin::util::ecdsa::{PrivateKey, PublicKey as BitcoinPubKey};
-use bitcoin::util::{address::Payload, address::Address};
-// Use p2pkh for 1st iteration
-use bitcoin::hash_types::PubkeyHash;
+use bitcoin::util::address::Address;
+
 use bitcoin::network::constants::Network;
 use super::reqrep::{PeerId, RepProtocol, Reply, ReqProtocol, Request};
 use crate::blockchain::{rocks::columns, RocksColumn, CashierKeypair, CashierStore};
@@ -155,6 +154,9 @@ impl CashierService {
                 let btc_keys = BitcoinKeys::new().unwrap();
                 let deposit_address = btc_keys.get_deposit_address();
 
+                // add to slabstore
+                let error = cashierstore.put(deserialize(&zkpub)?)?;
+
                 let mut reply = Reply::from(&request, CashierError::NoError as u32, vec![]);
                 // if let None = error {
                 //     reply.set_error(CashierError::UpdateIndex as u32);