cleaned up cli print statements

README.md

@@ -30,7 +30,7 @@ $ cargo run --bin darkfid -- -v
 $ cargo run --bin cashierd -- -v
 ```
 
-6. Initialize the wallet & Generate key pair:
+6. Initialize wallet and generate key pair:
 
 ```console
 $ cargo run --bin drk -- -wk 

src/bin/drk.rs

@@ -45,52 +45,52 @@ impl Drk {
 
     pub async fn say_hello(&self) -> Result<()> {
         let r = jsonrpc::request(json!("say_hello"), json!([]));
-        Ok(self.request("Say Hello", r).await?)
+        Ok(self.request("say hello", r).await?)
     }
 
     pub async fn create_cashier_wallet(&self) -> Result<()> {
         let r = jsonrpc::request(json!("create_cashier_wallet"), json!([]));
-        Ok(self.request("Create Cashier Wallet", r).await?)
+        Ok(self.request("create cashier wallet", r).await?)
     }
 
     pub async fn create_wallet(&self) -> Result<()> {
         let r = jsonrpc::request(json!("create_wallet"), json!([]));
-        Ok(self.request("Create Wallet", r).await?)
+        Ok(self.request("create wallet", r).await?)
     }
 
     pub async fn key_gen(&self) -> Result<()> {
         let r = jsonrpc::request(json!("key_gen"), json!([]));
-        Ok(self.request("Key Gen", r).await?)
+        Ok(self.request("key gen", r).await?)
     }
 
     pub async fn get_key(&self) -> Result<()> {
         let r = jsonrpc::request(json!("get_key"), json!([]));
-        Ok(self.request("Get Key", r).await?)
+        Ok(self.request("get key", r).await?)
     }
 
     pub async fn get_info(&self) -> Result<()> {
         let r = jsonrpc::request(json!("get_info"), json!([]));
-        Ok(self.request("Get Info", r).await?)
+        Ok(self.request("get info", r).await?)
     }
 
     pub async fn stop(&self) -> Result<()> {
         let r = jsonrpc::request(json!("stop"), json!([]));
-        Ok(self.request("Stop", r).await?)
+        Ok(self.request("stop", r).await?)
     }
 
     pub async fn deposit(&self) -> Result<()> {
         let r = jsonrpc::request(json!("deposit"), json!([]));
-        Ok(self.request("Deposit Address", r).await?)
+        Ok(self.request("deposit BTC to this address:", r).await?)
     }
 
     pub async fn transfer(&self, address: String, amount: u64) -> Result<()> {
         let r = jsonrpc::request(json!("transfer"), json!([address, amount]));
-        Ok(self.request("Transfer", r).await?)
+        Ok(self.request("transfer", r).await?)
     }
 
     pub async fn withdraw(&self, address: String, amount: u64) -> Result<()> {
         let r = jsonrpc::request(json!("withdraw"), json!([address, amount]));
-        Ok(self.request("Withdraw", r).await?)
+        Ok(self.request("withdraw", r).await?)
     }
 }
 

src/cli/drk_cli.rs

@@ -87,7 +87,7 @@ impl DrkCli {
             .arg(
                 Arg::new("hello")
                     .long("hello")
-                    .help_heading(Some("Test Hello"))
+                    .help_heading(Some("Say hello"))
                     .takes_value(false),
             )
             .arg(

src/rpc/adapter.rs

@@ -76,12 +76,6 @@ impl RpcAdapter {
         Ok(bs58_address)
     }
 
-    pub fn test_wallet(&self) -> Result<()> {
-        self.wallet.test_wallet()?;
-        debug!(target: "adapter", "test wallet: START");
-        Ok(())
-    }
-
     pub async fn deposit(&self) -> Result<PubAddress> {
         debug!(target: "deposit", "deposit: START");
         let (public, private) = self.wallet.key_gen();

src/rpc/jsonserver.rs

@@ -141,7 +141,7 @@ impl RpcInterface {
         let mut io = jsonrpc_core::IoHandler::new();
 
         io.add_sync_method("say_hello", |_| {
-            Ok(jsonrpc_core::Value::String("Hello World!".into()))
+            Ok(jsonrpc_core::Value::String("hello world!".into()))
         });
 
         let self1 = self.clone();
@@ -184,12 +184,8 @@ impl RpcInterface {
         io.add_method("create_wallet", move |_| {
             let self2 = self1.clone();
             async move {
-                println!(
-                    "Attempting wallet generation at path {:?}",
-                    self2.adapter.wallet.path
-                );
                 self2.adapter.init_db()?;
-                Ok(jsonrpc_core::Value::String("Created wallet".into()))
+                Ok(jsonrpc_core::Value::String("wallet creation successful".into()))
             }
         });
 
@@ -197,10 +193,9 @@ impl RpcInterface {
         io.add_method("key_gen", move |_| {
             let self2 = self1.clone();
             async move {
-                println!("Key generation method called...");
                 self2.adapter.key_gen()?;
                 Ok(jsonrpc_core::Value::String(
-                    "Key generation successful".into(),
+                    "key generation successful".into(),
                 ))
             }
         });
@@ -209,32 +204,19 @@ impl RpcInterface {
         io.add_method("cash_key_gen", move |_| {
             let self2 = self1.clone();
             async move {
-                println!("Key generation method called...");
                 self2.adapter.cash_key_gen()?;
                 Ok(jsonrpc_core::Value::String(
-                    "Attempted key generation".into(),
+                    "key generation successful".into(),
                 ))
             }
         });
 
-        let self1 = self.clone();
-        io.add_method("test_wallet", move |_| {
-            let self2 = self1.clone();
-            async move {
-                println!("Test wallet method called...");
-                self2.adapter.test_wallet()?;
-                Ok(jsonrpc_core::Value::String("Test wallet".into()))
-            }
-        });
-
         let self1 = self.clone();
         io.add_method("create_cashier_wallet", move |_| {
             let self2 = self1.clone();
             async move {
-                println!("New wallet method called...");
                 self2.adapter.init_cashier_db()?;
-                println!("Wallet created at path {:?}", self2.adapter.wallet.path);
-                Ok(jsonrpc_core::Value::String("Created cashier wallet".into()))
+                Ok(jsonrpc_core::Value::String("cashier wallet creation successful".into()))
             }
         });
 
@@ -242,10 +224,9 @@ impl RpcInterface {
         io.add_method("deposit", move |_| {
             let self2 = self1.clone();
             async move {
-                println!("Deposit initiated");
                 let btckey = self2.adapter.deposit().await?;
                 Ok(jsonrpc_core::Value::String(format!(
-                    "Send testnet BTC to: {}",
+                    "{}",
                     btckey
                 )))
             }
@@ -256,11 +237,11 @@ impl RpcInterface {
             let self2 = self1.clone();
             async move {
                 let parsed: TransferParams = params.parse().unwrap();
+                let amount = parsed.amount.clone();
                 let address = parsed.pub_key.clone();
                 self2.adapter.transfer(parsed).await?;
                 Ok(jsonrpc_core::Value::String(format!(
-                    "Transfer To: {}",
-                    address
+                    "transfered {} DRK to {}", amount, address
                 )))
             }
         });
@@ -268,7 +249,7 @@ impl RpcInterface {
         io.add_method("withdraw", |params: jsonrpc_core::Params| async move {
             let parsed: WithdrawParams = params.parse().unwrap();
             println!("test withdraw params:  {:?}", parsed);
-            Ok(jsonrpc_core::Value::String("Transfer To... ".into()))
+            Ok(jsonrpc_core::Value::String("withdraw BTC to... ".into()))
         });
 
         debug!(target: "rpc", "JsonRpcInterface::handle_input() [END]");