Merge pull request hyperledger-indy#859 from Artemkaaas/bugfix/fee-proccesing

Cli fixed parsing fees string

Author: jovfer

cli/src/commands/ledger.rs

@@ -1079,9 +1079,6 @@ fn set_request_fees(request: &mut String, wallet_handle: i32, submitter_did: &st
 }
 
 fn parse_payment_inputs(inputs: &Vec<&str>) -> Result<String, ()> {
-    if inputs.is_empty() {
-        return Err(println_err!("Inputs list is empty"));
-    }
     serde_json::to_string(&inputs)
         .map_err(|_| println_err!("Wrong data has been received"))
 }
@@ -3433,6 +3430,28 @@ pub mod tests {
             TestUtils::cleanup_storage();
         }
 
+        #[test]
+        pub fn set_fees_prepare_works_for_empty_fees() {
+            TestUtils::cleanup_storage();
+            let ctx = CommandContext::new();
+
+            create_and_connect_pool(&ctx);
+            create_and_open_wallet(&ctx);
+            load_null_payment_plugin(&ctx);
+            new_did(&ctx, SEED_TRUSTEE);
+            use_did(&ctx, DID_TRUSTEE);
+            {
+                let cmd = set_fees_prepare_command::new();
+                let mut params = CommandParams::new();
+                params.insert("payment_method", NULL_PAYMENT_METHOD.to_string());
+                params.insert("fees", "".to_string());
+                cmd.execute(&ctx, &params).unwrap_err();
+            }
+            close_and_delete_wallet(&ctx);
+            disconnect_and_delete_pool(&ctx);
+            TestUtils::cleanup_storage();
+        }
+
         #[test]
         pub fn set_fees_prepare_works_for_no_active_wallet() {
             TestUtils::cleanup_storage();

cli/src/commands/mod.rs

@@ -88,8 +88,9 @@ pub fn get_opt_bool_param(key: &str, params: &CommandParams) -> Result<Option<bo
 
 pub fn get_str_array_param<'a>(name: &'a str, params: &'a CommandParams) -> Result<Vec<&'a str>, ()> {
     match params.get(name) {
-        Some(v) => Ok(if v.is_empty() {Vec::new()} else { v.split(",").collect::<Vec<&'a str>>() }),
-        None => Err(println_err!("No required \"{}\" parameter present", name))
+        None => Err(println_err!("No required \"{}\" parameter present", name)),
+        Some(v) if v.is_empty() => Err(println_err!("No required \"{}\" parameter present", name)),
+        Some(v) => Ok(v.split(",").collect::<Vec<&'a str>>())
     }
 }