improve ux

Signed-off-by: Sam Batschelet <[email protected]>

Author: hexfusion

spaces-cli/src/bin/spaces-cli/main.rs

@@ -84,9 +84,9 @@ fn main() -> Result<(), Box<dyn error::Error>> {
 /// Takes a TX command and returns transaction data.
 fn command_to_tx(command: Command) -> std::io::Result<TransactionData> {
     match command {
-        Command::Claim { space } => Ok(claim_tx(space)),
-        Command::Set { space, key, value } => Ok(set_tx(space, key, value.as_bytes().to_vec())),
-        Command::Delete { space, key } => Ok(delete_tx(space, key)),
+        Command::Claim { space } => Ok(claim_tx(&space)),
+        Command::Set { space, key, value } => Ok(set_tx(&space, &key, &value)),
+        Command::Delete { space, key } => Ok(delete_tx(&space, &key)),
         _ => Err(std::io::Error::new(
             std::io::ErrorKind::Other,
             "not a supported tx",

spacesvm/src/api/client.rs

@@ -177,29 +177,29 @@ impl Client<HttpConnector> {
     }
 }
 
-pub fn claim_tx(space: String) -> TransactionData {
+pub fn claim_tx(space: &str) -> TransactionData {
     TransactionData {
         typ: TransactionType::Claim,
-        space,
+        space: space.to_owned(),
         key: String::new(),
         value: vec![],
     }
 }
 
-pub fn set_tx(space: String, key: String, value: Vec<u8>) -> TransactionData {
+pub fn set_tx(space: &str, key: &str, value: &str) -> TransactionData {
     TransactionData {
         typ: TransactionType::Set,
-        space,
-        key,
-        value,
+        space: space.to_owned(),
+        key: key.to_owned(),
+        value: value.as_bytes().to_vec(),
     }
 }
 
-pub fn delete_tx(space: String, key: String) -> TransactionData {
+pub fn delete_tx(space: &str, key: &str) -> TransactionData {
     TransactionData {
         typ: TransactionType::Delete,
-        space,
-        key,
+        space: space.to_owned(),
+        key: key.to_owned(),
         value: vec![],
     }
 }

spacesvm/tests/vm/mod.rs

@@ -138,7 +138,7 @@ async fn test_api() {
     let body = std::str::from_utf8(&resp.body()).unwrap();
     log::info!("ping response {}", body);
 
-    let tx_data = claim_tx("test_claim".to_owned());
+    let tx_data = claim_tx("test_claim");
     let arg_value = serde_json::to_value(&DecodeTxArgs { tx_data }).unwrap();
 
     let (_id, json_str) = client.raw_request("decodeTx", &Params::Array(vec![arg_value]));

tests/e2e/src/tests/mod.rs

@@ -9,10 +9,7 @@ use avalanche_network_runner_sdk::{BlockchainSpec, Client, GlobalConfig, StartRe
 use avalanche_types::subnet;
 use spacesvm::{
     self,
-    api::{
-        client::{claim_tx, get_or_create_pk, Uri},
-        DecodeTxArgs,
-    },
+    api::client::{claim_tx, get_or_create_pk, Uri},
 };
 
 #[tokio::test]
@@ -199,9 +196,7 @@ async fn e2e() {
 
     log::info!("decode claim tx request...");
     let resp = scli
-        .decode_tx(DecodeTxArgs {
-            tx_data: claim_tx("test".to_owned()),
-        })
+        .decode_tx(claim_tx("test"))
         .await
         .expect("decodeTx success");
     log::info!("decode claim response from {}: {:?}", ep, resp);