Fix for #2169 (#2170)

* return all matching tx entries from retrieve_txs * rustfmt
2018-12-17 10:40:48 +00:00
parent ea1c3a9d4d
commit fcec70d1e3
1 changed files with 5 additions and 12 deletions
@@ -94,19 +94,12 @@ where
 {
 	// just read the wallet here, no need for a write lock
 	let mut txs = if let Some(id) = tx_id {
-		let tx = wallet.tx_log_iter().find(|t| t.id == id);
-		if let Some(t) = tx {
-			vec![t]
-		} else {
-			vec![]
-		}
+		wallet.tx_log_iter().filter(|t| t.id == id).collect()
 	} else if tx_slate_id.is_some() {
-		let tx = wallet.tx_log_iter().find(|t| t.tx_slate_id == tx_slate_id);
-		if let Some(t) = tx {
-			vec![t]
-		} else {
-			vec![]
-		}
+		wallet
+			.tx_log_iter()
+			.filter(|t| t.tx_slate_id == tx_slate_id)
+			.collect()
 	} else {
 		wallet.tx_log_iter().collect::<Vec<_>>()
 	};