clean up

src/bin/drk.rs

@@ -215,7 +215,7 @@ async fn start(config: &DrkConfig, options: CliDrk) -> Result<()> {
 
                     table.printstd();
                 } else {
-                    println!("Balances: {}", "0".to_string());
+                    println!("Balances: {}", 0);
                 }
 
                 return Ok(())
@@ -248,11 +248,7 @@ async fn start(config: &DrkConfig, options: CliDrk) -> Result<()> {
 
             client.transfer(&network, &token_sym, &address, &amount.to_string()).await?;
 
-            println!(
-                "{} {} Transfered successfully",
-                amount.to_string(),
-                token_sym.to_string().to_uppercase(),
-            );
+            println!("{} {} Transfered successfully", amount, token_sym.to_uppercase(),);
 
             return Ok(())
         }

src/client.rs

@@ -185,9 +185,10 @@ impl Client {
         outputs.push(tx::TransactionBuilderOutputInfo { value, token_id, public: pubkey });
 
         let builder = tx::TransactionBuilder { clear_inputs, inputs, outputs };
-        let tx: tx::Transaction;
+
         let mut tx_data = vec![];
-        tx = builder.build(&self.mint_pk, &self.spend_pk)?;
+
+        let tx: tx::Transaction = builder.build(&self.mint_pk, &self.spend_pk)?;
         tx.encode(&mut tx_data).expect("encode tx");
 
         let slab = Slab::new(tx_data);

src/rpc/jsonrpc.rs

@@ -180,12 +180,12 @@ pub async fn send_raw_request(url: &str, data: Value) -> Result<JsonResult, Erro
 
 pub async fn send_unix_request(path: &str, data: Value) -> Result<JsonResult, Error> {
     let mut buf = [0; 2048];
-    let bytes_read: usize;
     let data_str = serde_json::to_string(&data)?;
 
     let mut stream = Async::<UnixStream>::connect(path).await?;
     stream.write_all(data_str.as_bytes()).await?;
-    bytes_read = stream.read(&mut buf[..]).await?;
+
+    let bytes_read: usize = stream.read(&mut buf[..]).await?;
 
     let reply: JsonResult = serde_json::from_slice(&buf[0..bytes_read])?;
     Ok(reply)

src/rpc/rpcserver.rs

@@ -151,15 +151,13 @@ pub async fn listen_and_serve(
     rh: Arc<impl RequestHandler + 'static>,
     executor: Arc<Executor<'_>>,
 ) -> Result<()> {
-    let tls: Option<TlsAcceptor>;
-
-    if cfg.use_tls {
+    let tls: Option<TlsAcceptor> = if cfg.use_tls {
         let ident_bytes = std::fs::read(cfg.identity_path)?;
         let identity = Identity::from_pkcs12(&ident_bytes, &cfg.identity_pass)?;
-        tls = Some(TlsAcceptor::from(native_tls::TlsAcceptor::new(identity)?));
+        Some(TlsAcceptor::from(native_tls::TlsAcceptor::new(identity)?))
     } else {
-        tls = None;
-    }
+        None
+    };
 
     let listener = listen(Async::<TcpListener>::bind(cfg.socket_addr)?, tls, rh, executor);
     listener.await

src/service/btc.rs

@@ -361,7 +361,6 @@ impl BtcClient {
         }
         //Fetch any current balance
         let prev_balance = client.lock().await.electrum.script_get_balance(&script)?;
-        let cur_balance: GetBalanceRes;
         let mut last_status = None;
 
         loop {
@@ -396,7 +395,8 @@ impl BtcClient {
             let _ = &mut client.lock().await.subscriptions.remove(*ind);
         }
 
-        cur_balance = client.lock().await.electrum.script_get_balance(&script)?;
+        let cur_balance: GetBalanceRes =
+            client.lock().await.electrum.script_get_balance(&script)?;
 
         let send_notification = self.notify_channel.0.clone();
         //FIXME: dev
@@ -491,7 +491,7 @@ impl BtcClient {
         let _serialized_tx = serialize(&signed_tx);
 
         info!(target: "BTC BRIDGE", "Signed tx: {:?}",
-               serialize_hex(&signed_tx));
+            serialize_hex(&signed_tx));
 
         let txid = electrum.transaction_broadcast_raw(&signed_tx.serialize().to_vec())?;
 

src/service/reqrep.rs

@@ -27,7 +27,7 @@ enum NetEvent {
 }
 
 pub fn addr_to_string(addr: SocketAddr) -> String {
-    format!("tcp://{}", addr.to_string())
+    format!("tcp://{}", addr)
 }
 
 pub struct RepProtocol {

src/util/address.rs

@@ -23,7 +23,7 @@ impl Address {
 
         // ripemd160
         let mut hasher = ripemd160::Ripemd160::new();
-        hasher.update(hash.to_vec());
+        hasher.update(hash);
         let hash = hasher.finalize();
         hash.to_vec()
     }

src/util/parse.rs

@@ -148,13 +148,12 @@ pub fn decode_base10(amount: &str, decimal_places: usize, strict: bool) -> Resul
     let mut s: Vec<char> = amount.to_string().chars().collect();
 
     // Get rid of the decimal point:
-    let point: usize;
-    if let Some(p) = amount.find('.') {
+    let point: usize = if let Some(p) = amount.find('.') {
         s.remove(p);
-        point = p;
+        p
     } else {
-        point = s.len();
-    }
+        s.len()
+    };
 
     // Only digits should remain
     for i in &s {