From cfc4d546bf90a7061fe40d620fb30d9981823d52 Mon Sep 17 00:00:00 2001
From: ClaytonNorthey92 <clayton.northey@gmail.com>
Date: Wed, 17 Jul 2024 16:08:11 -0400
Subject: [PATCH] get rid of some shadowing

---
 service/tbc/rpc_test.go | 80 ++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/service/tbc/rpc_test.go b/service/tbc/rpc_test.go
index 8ae3438b5..bdb57c7b9 100644
--- a/service/tbc/rpc_test.go
+++ b/service/tbc/rpc_test.go
@@ -62,7 +62,7 @@ func TestBlockHeadersByHeightRaw(t *testing.T) {
 		t.Fatal(ctx.Err())
 	}
 
-	if err := tbcapi.Write(ctx, tws.conn, "someid", tbcapi.BlockHeadersByHeightRawRequest{
+	if err = tbcapi.Write(ctx, tws.conn, "someid", tbcapi.BlockHeadersByHeightRawRequest{
 		Height: 55,
 	}); err != nil {
 		t.Fatal(err)
@@ -77,7 +77,7 @@ func TestBlockHeadersByHeightRaw(t *testing.T) {
 		t.Fatalf("received unexpected command: %s", v.Header.Command)
 	}
 
-	if err := json.Unmarshal(v.Payload, &response); err != nil {
+	if err = json.Unmarshal(v.Payload, &response); err != nil {
 		t.Fatal(err)
 	}
 
@@ -133,14 +133,14 @@ func TestBlockHeadersByHeight(t *testing.T) {
 		t.Fatal(ctx.Err())
 	}
 
-	if err := tbcapi.Write(ctx, tws.conn, "someid", tbcapi.BlockHeadersByHeightRequest{
+	if err = tbcapi.Write(ctx, tws.conn, "someid", tbcapi.BlockHeadersByHeightRequest{
 		Height: 55,
 	}); err != nil {
 		t.Fatal(err)
 	}
 
 	var v protocol.Message
-	if err := wsjson.Read(ctx, c, &v); err != nil {
+	if err = wsjson.Read(ctx, c, &v); err != nil {
 		t.Fatal(err)
 	}
 
@@ -148,7 +148,7 @@ func TestBlockHeadersByHeight(t *testing.T) {
 		t.Fatalf("received unexpected command: %s", v.Header.Command)
 	}
 
-	if err := json.Unmarshal(v.Payload, &response); err != nil {
+	if err = json.Unmarshal(v.Payload, &response); err != nil {
 		t.Fatal(err)
 	}
 
@@ -197,14 +197,14 @@ func TestBlockHeadersByHeightDoesNotExist(t *testing.T) {
 		t.Fatal(ctx.Err())
 	}
 
-	if err := tbcapi.Write(ctx, tws.conn, "someid", tbcapi.BlockHeadersByHeightRequest{
+	if err = tbcapi.Write(ctx, tws.conn, "someid", tbcapi.BlockHeadersByHeightRequest{
 		Height: 550,
 	}); err != nil {
 		t.Fatal(err)
 	}
 
 	var v protocol.Message
-	if err := wsjson.Read(ctx, c, &v); err != nil {
+	if err = wsjson.Read(ctx, c, &v); err != nil {
 		t.Fatal(err)
 	}
 
@@ -212,7 +212,7 @@ func TestBlockHeadersByHeightDoesNotExist(t *testing.T) {
 		t.Fatalf("received unexpected command: %s", v.Header.Command)
 	}
 
-	if err := json.Unmarshal(v.Payload, &response); err != nil {
+	if err = json.Unmarshal(v.Payload, &response); err != nil {
 		t.Fatal(err)
 	}
 
@@ -254,12 +254,12 @@ func TestBlockHeaderBestRaw(t *testing.T) {
 	case <-ctx.Done():
 		t.Fatal(ctx.Err())
 	}
-	if err := tbcapi.Write(ctx, tws.conn, "someid", tbcapi.BlockHeaderBestRawRequest{}); err != nil {
+	if err = tbcapi.Write(ctx, tws.conn, "someid", tbcapi.BlockHeaderBestRawRequest{}); err != nil {
 		t.Fatal(err)
 	}
 
 	var v protocol.Message
-	if err := wsjson.Read(ctx, c, &v); err != nil {
+	if err = wsjson.Read(ctx, c, &v); err != nil {
 		t.Fatal(err)
 	}
 
@@ -267,7 +267,7 @@ func TestBlockHeaderBestRaw(t *testing.T) {
 		t.Fatalf("received unexpected command: %s", v.Header.Command)
 	}
 
-	if err := json.Unmarshal(v.Payload, &response); err != nil {
+	if err = json.Unmarshal(v.Payload, &response); err != nil {
 		t.Fatal(err)
 	}
 
@@ -323,12 +323,12 @@ func TestBtcBlockHeaderBest(t *testing.T) {
 		t.Fatal(ctx.Err())
 	}
 
-	if err := tbcapi.Write(ctx, tws.conn, "someid", tbcapi.BlockHeaderBestRequest{}); err != nil {
+	if err = tbcapi.Write(ctx, tws.conn, "someid", tbcapi.BlockHeaderBestRequest{}); err != nil {
 		t.Fatal(err)
 	}
 
 	var v protocol.Message
-	if err := wsjson.Read(ctx, c, &v); err != nil {
+	if err = wsjson.Read(ctx, c, &v); err != nil {
 		t.Fatal(err)
 	}
 
@@ -336,7 +336,7 @@ func TestBtcBlockHeaderBest(t *testing.T) {
 		t.Fatalf("received unexpected command: %s", v.Header.Command)
 	}
 
-	if err := json.Unmarshal(v.Payload, &response); err != nil {
+	if err = json.Unmarshal(v.Payload, &response); err != nil {
 		t.Fatal(err)
 	}
 
@@ -493,7 +493,7 @@ func TestBalanceByAddress(t *testing.T) {
 				}
 				indexAll(ctx, t, tbcServer)
 
-				if err := tbcapi.Write(ctx, tws.conn, "someid", tbcapi.BalanceByAddressRequest{
+				if err = tbcapi.Write(ctx, tws.conn, "someid", tbcapi.BalanceByAddressRequest{
 					Address: tti.address(),
 				}); err != nil {
 					t.Fatal(err)
@@ -508,7 +508,7 @@ func TestBalanceByAddress(t *testing.T) {
 				if v.Header.Command != tbcapi.CmdBalanceByAddressResponse {
 					t.Fatalf("received unexpected command: %s", v.Header.Command)
 				} else {
-					if err := json.Unmarshal(v.Payload, &response); err != nil {
+					if err = json.Unmarshal(v.Payload, &response); err != nil {
 						t.Fatal(err)
 					}
 
@@ -716,7 +716,7 @@ func TestUtxosByAddressRaw(t *testing.T) {
 			}
 			indexAll(ctx, t, tbcServer)
 
-			if err := tbcapi.Write(ctx, tws.conn, "someid", tbcapi.UtxosByAddressRawRequest{
+			if err = tbcapi.Write(ctx, tws.conn, "someid", tbcapi.UtxosByAddressRawRequest{
 				Address: tti.address(),
 				Start:   uint(tti.start),
 				Count:   uint(tti.limit),
@@ -734,7 +734,7 @@ func TestUtxosByAddressRaw(t *testing.T) {
 				t.Fatalf("received unexpected command: %s", v.Header.Command)
 			}
 
-			if err := json.Unmarshal(v.Payload, &response); err != nil {
+			if err = json.Unmarshal(v.Payload, &response); err != nil {
 				t.Fatal(err)
 			}
 
@@ -929,7 +929,7 @@ func TestUtxosByAddress(t *testing.T) {
 			}
 			indexAll(ctx, t, tbcServer)
 
-			if err := tbcapi.Write(ctx, tws.conn, "someid", tbcapi.UtxosByAddressRequest{
+			if err = tbcapi.Write(ctx, tws.conn, "someid", tbcapi.UtxosByAddressRequest{
 				Address: tti.address(),
 				Start:   uint(tti.start),
 				Count:   uint(tti.limit),
@@ -947,7 +947,7 @@ func TestUtxosByAddress(t *testing.T) {
 				t.Fatalf("received unexpected command: %s", v.Header.Command)
 			}
 
-			if err := json.Unmarshal(v.Payload, &response); err != nil {
+			if err = json.Unmarshal(v.Payload, &response); err != nil {
 				t.Fatal(err)
 			}
 
@@ -1017,14 +1017,14 @@ func TestTxByIdRaw(t *testing.T) {
 
 	slices.Reverse(txIdBytes) // convert to natural order
 
-	if err := tbcapi.Write(ctx, tws.conn, "someid", tbcapi.TxByIdRawRequest{
+	if err = tbcapi.Write(ctx, tws.conn, "someid", tbcapi.TxByIdRawRequest{
 		TxId: txIdBytes,
 	}); err != nil {
 		t.Fatal(err)
 	}
 
 	var v protocol.Message
-	if err := wsjson.Read(ctx, c, &v); err != nil {
+	if err = wsjson.Read(ctx, c, &v); err != nil {
 		t.Fatal(err)
 	}
 
@@ -1032,7 +1032,7 @@ func TestTxByIdRaw(t *testing.T) {
 		t.Fatalf("received unexpected command: %s", v.Header.Command)
 	}
 
-	if err := json.Unmarshal(v.Payload, &response); err != nil {
+	if err = json.Unmarshal(v.Payload, &response); err != nil {
 		t.Fatal(err)
 	}
 
@@ -1106,14 +1106,14 @@ func TestTxByIdRawInvalid(t *testing.T) {
 
 	slices.Reverse(txIdBytes) // convert to natural order
 
-	if err := tbcapi.Write(ctx, tws.conn, "someid", tbcapi.TxByIdRawRequest{
+	if err = tbcapi.Write(ctx, tws.conn, "someid", tbcapi.TxByIdRawRequest{
 		TxId: txIdBytes,
 	}); err != nil {
 		t.Fatal(err)
 	}
 
 	var v protocol.Message
-	if err := wsjson.Read(ctx, c, &v); err != nil {
+	if err = wsjson.Read(ctx, c, &v); err != nil {
 		t.Fatal(err)
 	}
 
@@ -1121,7 +1121,7 @@ func TestTxByIdRawInvalid(t *testing.T) {
 		t.Fatalf("received unexpected command: %s", v.Header.Command)
 	}
 
-	if err := json.Unmarshal(v.Payload, &response); err != nil {
+	if err = json.Unmarshal(v.Payload, &response); err != nil {
 		t.Fatal(err)
 	}
 
@@ -1202,14 +1202,14 @@ func TestTxByIdRawNotFound(t *testing.T) {
 
 	slices.Reverse(txIdBytes) // convert to natural order
 
-	if err := tbcapi.Write(ctx, tws.conn, "someid", tbcapi.TxByIdRawRequest{
+	if err = tbcapi.Write(ctx, tws.conn, "someid", tbcapi.TxByIdRawRequest{
 		TxId: txIdBytes,
 	}); err != nil {
 		t.Fatal(err)
 	}
 
 	var v protocol.Message
-	if err := wsjson.Read(ctx, c, &v); err != nil {
+	if err = wsjson.Read(ctx, c, &v); err != nil {
 		t.Fatal(err)
 	}
 
@@ -1217,7 +1217,7 @@ func TestTxByIdRawNotFound(t *testing.T) {
 		t.Fatalf("received unexpected command: %s", v.Header.Command)
 	}
 
-	if err := json.Unmarshal(v.Payload, &response); err != nil {
+	if err = json.Unmarshal(v.Payload, &response); err != nil {
 		t.Fatal(err)
 	}
 
@@ -1281,14 +1281,14 @@ func TestTxById(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if err := tbcapi.Write(ctx, tws.conn, "someid", tbcapi.TxByIdRequest{
+	if err = tbcapi.Write(ctx, tws.conn, "someid", tbcapi.TxByIdRequest{
 		TxId: txIdBytes,
 	}); err != nil {
 		t.Fatal(err)
 	}
 
 	var v protocol.Message
-	if err := wsjson.Read(ctx, c, &v); err != nil {
+	if err = wsjson.Read(ctx, c, &v); err != nil {
 		t.Fatal(err)
 	}
 
@@ -1296,7 +1296,7 @@ func TestTxById(t *testing.T) {
 		t.Fatalf("received unexpected command: %s", v.Header.Command)
 	}
 
-	if err := json.Unmarshal(v.Payload, &response); err != nil {
+	if err = json.Unmarshal(v.Payload, &response); err != nil {
 		t.Fatal(err)
 	}
 
@@ -1365,14 +1365,14 @@ func TestTxByIdInvalid(t *testing.T) {
 
 	txIdBytes[0]++
 
-	if err := tbcapi.Write(ctx, tws.conn, "someid", tbcapi.TxByIdRequest{
+	if err = tbcapi.Write(ctx, tws.conn, "someid", tbcapi.TxByIdRequest{
 		TxId: txIdBytes,
 	}); err != nil {
 		t.Fatal(err)
 	}
 
 	var v protocol.Message
-	if err := wsjson.Read(ctx, c, &v); err != nil {
+	if err = wsjson.Read(ctx, c, &v); err != nil {
 		t.Fatal(err)
 	}
 
@@ -1380,7 +1380,7 @@ func TestTxByIdInvalid(t *testing.T) {
 		t.Fatalf("received unexpected command: %s", v.Header.Command)
 	}
 
-	if err := json.Unmarshal(v.Payload, &response); err != nil {
+	if err = json.Unmarshal(v.Payload, &response); err != nil {
 		t.Fatal(err)
 	}
 
@@ -1460,14 +1460,14 @@ func TestTxByIdNotFound(t *testing.T) {
 
 	txIdBytes = append(txIdBytes, 8)
 
-	if err := tbcapi.Write(ctx, tws.conn, "someid", tbcapi.TxByIdRequest{
+	if err = tbcapi.Write(ctx, tws.conn, "someid", tbcapi.TxByIdRequest{
 		TxId: txIdBytes,
 	}); err != nil {
 		t.Fatal(err)
 	}
 
 	var v protocol.Message
-	if err := wsjson.Read(ctx, c, &v); err != nil {
+	if err = wsjson.Read(ctx, c, &v); err != nil {
 		t.Fatal(err)
 	}
 
@@ -1475,7 +1475,7 @@ func TestTxByIdNotFound(t *testing.T) {
 		t.Fatalf("received unexpected command: %s", v.Header.Command)
 	}
 
-	if err := json.Unmarshal(v.Payload, &response); err != nil {
+	if err = json.Unmarshal(v.Payload, &response); err != nil {
 		t.Fatal(err)
 	}
 
@@ -1510,11 +1510,11 @@ func indexAll(ctx context.Context, t *testing.T, tbcServer *Server) {
 
 	hash := bh.BlockHash()
 
-	if err := tbcServer.TxIndexer(ctx, &hash); err != nil {
+	if err = tbcServer.TxIndexer(ctx, &hash); err != nil {
 		t.Fatal(err)
 	}
 
-	if err := tbcServer.UtxoIndexer(ctx, &hash); err != nil {
+	if err = tbcServer.UtxoIndexer(ctx, &hash); err != nil {
 		t.Fatal(err)
 	}
 }