From 42e7a4cdd29aa93ae9273e5ed39cb0519385579b Mon Sep 17 00:00:00 2001
From: Chris <chris@ob1.io>
Date: Fri, 10 Jan 2020 10:02:56 -0500
Subject: [PATCH] Revert multiwallet client continue on error

---
 Godeps/Godeps.json                            | 38 +++++++++----------
 .../multiwallet/client/blockbook/client.go    |  4 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 3bbd8a2f20..c24f0c7de2 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -50,75 +50,75 @@
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet",
-			"Rev": "9279fb62abf3f072d55d9c7c19701550a5bcc694"
+			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/bitcoin",
-			"Rev": "9279fb62abf3f072d55d9c7c19701550a5bcc694"
+			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/bitcoincash",
-			"Rev": "9279fb62abf3f072d55d9c7c19701550a5bcc694"
+			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/cache",
-			"Rev": "9279fb62abf3f072d55d9c7c19701550a5bcc694"
+			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/client",
-			"Rev": "9279fb62abf3f072d55d9c7c19701550a5bcc694"
+			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/client/blockbook",
-			"Rev": "9279fb62abf3f072d55d9c7c19701550a5bcc694"
+			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/client/transport",
-			"Rev": "9279fb62abf3f072d55d9c7c19701550a5bcc694"
+			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/config",
-			"Rev": "9279fb62abf3f072d55d9c7c19701550a5bcc694"
+			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/datastore",
-			"Rev": "9279fb62abf3f072d55d9c7c19701550a5bcc694"
+			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/keys",
-			"Rev": "9279fb62abf3f072d55d9c7c19701550a5bcc694"
+			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/litecoin",
-			"Rev": "9279fb62abf3f072d55d9c7c19701550a5bcc694"
+			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/litecoin/address",
-			"Rev": "9279fb62abf3f072d55d9c7c19701550a5bcc694"
+			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/litecoin/params",
-			"Rev": "9279fb62abf3f072d55d9c7c19701550a5bcc694"
+			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/model",
-			"Rev": "9279fb62abf3f072d55d9c7c19701550a5bcc694"
+			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/service",
-			"Rev": "9279fb62abf3f072d55d9c7c19701550a5bcc694"
+			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/util",
-			"Rev": "9279fb62abf3f072d55d9c7c19701550a5bcc694"
+			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/zcash",
-			"Rev": "9279fb62abf3f072d55d9c7c19701550a5bcc694"
+			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/zcash/address",
-			"Rev": "9279fb62abf3f072d55d9c7c19701550a5bcc694"
+			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/spvwallet",
@@ -2513,7 +2513,7 @@
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/client/errors",
-			"Rev": "9279fb62abf3f072d55d9c7c19701550a5bcc694"
+			"Rev": "e2e450015927ced1aa82ded74eba802ec0b3ddf1"
 		},
 		{
 			"ImportPath": "github.com/OpenBazaar/multiwallet/vendor/github.com/OpenBazaar/wallet-interface",
diff --git a/vendor/github.com/OpenBazaar/multiwallet/client/blockbook/client.go b/vendor/github.com/OpenBazaar/multiwallet/client/blockbook/client.go
index ddd2274048..491871e555 100644
--- a/vendor/github.com/OpenBazaar/multiwallet/client/blockbook/client.go
+++ b/vendor/github.com/OpenBazaar/multiwallet/client/blockbook/client.go
@@ -374,7 +374,7 @@ func (i *BlockBookClient) GetTransactions(addrs []btcutil.Address) ([]model.Tran
 	for toe := range txChan {
 		if toe.Err != nil {
 			Log.Errorf("Error querying address from blockbook: %s", toe.Err.Error())
-			continue
+			return nil, toe.Err
 		}
 		txs = append(txs, toe.Txs...)
 	}
@@ -511,7 +511,7 @@ func (i *BlockBookClient) GetUtxos(addrs []btcutil.Address) ([]model.Utxo, error
 	for toe := range utxoChan {
 		if toe.Err != nil {
 			Log.Errorf("Error querying utxos from blockbook: %s", toe.Err.Error())
-			continue
+			return nil, toe.Err
 		}
 		if toe.Utxo != nil {
 			ret = append(ret, *toe.Utxo)