fix lint errors

Author: rohenaz

spv/verify.go

@@ -8,7 +8,9 @@ import (
 	"github.com/bitcoin-sv/go-sdk/transaction/chaintracker"
 )
 
-func Verify(t *transaction.Transaction, chainTracker chaintracker.ChainTracker, feeModel transaction.FeeModel) (bool, error) {
+func Verify(t *transaction.Transaction,
+	chainTracker chaintracker.ChainTracker,
+	feeModel transaction.FeeModel) (bool, error) {
 	verifiedTxids := make(map[string]struct{})
 	txQueue := []*transaction.Transaction{t}
 	if chainTracker == nil {

spv/verify_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/bitcoin-sv/go-sdk/transaction"
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 const BRC62Hex = "0100beef01fe636d0c0007021400fe507c0c7aa754cef1f7889d5fd395cf1f785dd7de98eed895dbedfe4e5bc70d1502ac4e164f5bc16746bb0868404292ac8318bbac3800e4aad13a014da427adce3e010b00bc4ff395efd11719b277694cface5aa50d085a0bb81f613f70313acd28cf4557010400574b2d9142b8d28b61d88e3b2c3f44d858411356b49a28a4643b6d1a6a092a5201030051a05fc84d531b5d250c23f4f886f6812f9fe3f402d61607f977b4ecd2701c19010000fd781529d58fc2523cf396a7f25440b409857e7e221766c57214b1d38c7b481f01010062f542f45ea3660f86c013ced80534cb5fd4c19d66c56e7e8c5d4bf2d40acc5e010100b121e91836fd7cd5102b654e9f72f3cf6fdbfd0b161c53a9c54b12c841126331020100000001cd4e4cac3c7b56920d1e7655e7e260d31f29d9a388d04910f1bbd72304a79029010000006b483045022100e75279a205a547c445719420aa3138bf14743e3f42618e5f86a19bde14bb95f7022064777d34776b05d816daf1699493fcdf2ef5a5ab1ad710d9c97bfb5b8f7cef3641210263e2dee22b1ddc5e11f6fab8bcd2378bdd19580d640501ea956ec0e786f93e76ffffffff013e660000000000001976a9146bfd5c7fbe21529d45803dbcf0c87dd3c71efbc288ac0000000001000100000001ac4e164f5bc16746bb0868404292ac8318bbac3800e4aad13a014da427adce3e000000006a47304402203a61a2e931612b4bda08d541cfb980885173b8dcf64a3471238ae7abcd368d6402204cbf24f04b9aa2256d8901f0ed97866603d2be8324c2bfb7a37bf8fc90edd5b441210263e2dee22b1ddc5e11f6fab8bcd2378bdd19580d640501ea956ec0e786f93e76ffffffff013c660000000000001976a9146bfd5c7fbe21529d45803dbcf0c87dd3c71efbc288ac0000000000"
@@ -14,18 +14,18 @@ const BEEF = "AQC+7wH+kQYNAAcCVAIKXThHm90iVbs15AIfFQEYl5xesbHCXMkYy9SqoR1vNVUAAZ
 
 func TestSPVVerify(t *testing.T) {
 	tx, err := transaction.NewTransactionFromBEEFHex(BRC62Hex)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	verified, err := Verify(tx, &GullibleHeadersClient{}, nil)
-	assert.NoError(t, err)
-	assert.True(t, verified)
+	require.NoError(t, err)
+	require.True(t, verified)
 }
 
 func TestSPVVerifyScripts(t *testing.T) {
 	buf, err := base64.StdEncoding.DecodeString(BEEF)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	tx, err := transaction.NewTransactionFromBEEF(buf)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	verified, err := VerifyScripts(tx)
-	assert.NoError(t, err)
-	assert.True(t, verified)
+	require.NoError(t, err)
+	require.True(t, verified)
 }

transaction/chaintracker/whatsonchain.go

@@ -1,7 +1,7 @@
 package chaintracker
 
 import (
-	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -39,29 +39,41 @@ func NewWhatsOnChain(network Network, apiKey string) *WhatsOnChain {
 	}
 }
 
-func (w *WhatsOnChain) GetBlockHeader(height uint32) (*BlockHeader, error) {
-	if req, err := http.NewRequest("GET", fmt.Sprintf("https://api.whatsonchain.com/v1/bsv/%s/block/%d/header", w.Network, height), bytes.NewBuffer([]byte{})); err != nil {
+// Assuming BlockHeader is defined elsewhere
+func (w *WhatsOnChain) GetBlockHeader(height uint32) (header *BlockHeader, err error) {
+	url := fmt.Sprintf("https://api.whatsonchain.com/v1/bsv/%s/block/%d/header", w.Network, height)
+	req, err := http.NewRequestWithContext(context.Background(), "GET", url, nil)
+	if err != nil {
 		return nil, err
-	} else {
-		req.Header.Set("Authorization", w.ApiKey)
-		if resp, err := http.DefaultClient.Do(req); err != nil {
-			return nil, err
-		} else {
-			defer resp.Body.Close()
-			if resp.StatusCode == 404 {
-				return nil, nil
-			}
-			if resp.StatusCode != 200 {
-				return nil, fmt.Errorf("failed to verify merkleroot for height %d because of an error: %v", height, resp.Status)
-			}
-			header := &BlockHeader{}
-			if err := json.NewDecoder(resp.Body).Decode(header); err != nil {
-				return nil, err
-			}
+	}
+
+	req.Header.Set("Authorization", w.ApiKey)
 
-			return header, nil
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	// Ensure resp.Body.Close() is called and its error is handled
+	defer func() {
+		closeErr := resp.Body.Close()
+		if closeErr != nil && err == nil {
+			err = closeErr
 		}
+	}()
+
+	if resp.StatusCode == http.StatusNotFound {
+		return nil, nil
 	}
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("failed to verify merkleroot for height %d: %v", height, resp.Status)
+	}
+
+	header = &BlockHeader{}
+	if err := json.NewDecoder(resp.Body).Decode(header); err != nil {
+		return nil, err
+	}
+
+	return header, nil
 }
 
 func (w *WhatsOnChain) IsValidRootForHeight(root *chainhash.Hash, height uint32) (bool, error) {