From 6caa80c91116d6f4a90e87752eaaad3b9500dfd8 Mon Sep 17 00:00:00 2001
From: trevyn <github@eden2.com>
Date: Sun, 4 Apr 2021 12:48:37 +0400
Subject: [PATCH] Bubble `init_send_tx` error instead of unwrapping

Fixes #582
---
 controller/src/command.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/controller/src/command.rs b/controller/src/command.rs
index 4ffd92acf..722e344e7 100644
--- a/controller/src/command.rs
+++ b/controller/src/command.rs
@@ -17,7 +17,6 @@
 use crate::api::TLSConfig;
 use crate::apiwallet::{try_slatepack_sync_workflow, Owner};
 use crate::config::{TorConfig, WalletConfig, WALLET_CONFIG_FILE_NAME};
-use crate::core::core::FeeFields;
 use crate::core::{core, global};
 use crate::error::{Error, ErrorKind};
 use crate::impls::PathToSlatepack;
@@ -278,7 +277,7 @@ where
 	let mut slate = Slate::blank(2, false);
 	controller::owner_single_use(None, keychain_mask, Some(owner_api), |api, m| {
 		if args.estimate_selection_strategies {
-			let strategies: Vec<(&str, u64, FeeFields)> = vec!["smallest", "all"]
+			let strategies = vec!["smallest", "all"]
 				.into_iter()
 				.map(|strategy| {
 					let init_args = InitTxArgs {
@@ -291,10 +290,10 @@ where
 						estimate_only: Some(true),
 						..Default::default()
 					};
-					let slate = api.init_send_tx(m, init_args).unwrap();
-					(strategy, slate.amount, slate.fee_fields)
+					let slate = api.init_send_tx(m, init_args)?;
+					Ok((strategy, slate.amount, slate.fee_fields))
 				})
-				.collect();
+				.collect::<Result<Vec<_>, grin_wallet_libwallet::Error>>()?;
 			display::estimate(args.amount, strategies, dark_scheme);
 			return Ok(());
 		} else {