multi: move many t.Fatalf calls to require.NoError

watchtower/blob/justice_kit_test.go

@@ -166,9 +166,7 @@ func testBlobJusticeKitEncryptDecrypt(t *testing.T, test descriptorTest) {
 	// party's commitment txid as the key.
 	var key blob.BreachKey
 	_, err := rand.Read(key[:])
-	if err != nil {
-		t.Fatalf("unable to generate blob encryption key: %v", err)
-	}
+	require.NoError(t, err, "unable to generate blob encryption key")
 
 	// Encrypt the blob plaintext using the generated key and
 	// target version for this test.

watchtower/lookout/lookout_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/lightningnetwork/lnd/watchtower/wtdb"
 	"github.com/lightningnetwork/lnd/watchtower/wtmock"
 	"github.com/lightningnetwork/lnd/watchtower/wtpolicy"
+	"github.com/stretchr/testify/require"
 )
 
 type mockPunisher struct {
@@ -116,13 +117,9 @@ func TestLookoutBreachMatching(t *testing.T) {
 
 	// Insert both sessions into the watchtower's database.
 	err := db.InsertSessionInfo(sessionInfo1)
-	if err != nil {
-		t.Fatalf("unable to insert session info: %v", err)
-	}
+	require.NoError(t, err, "unable to insert session info")
 	err = db.InsertSessionInfo(sessionInfo2)
-	if err != nil {
-		t.Fatalf("unable to insert session info: %v", err)
-	}
+	require.NoError(t, err, "unable to insert session info")
 
 	// Construct two distinct transactions, that will be used to test the
 	// breach hint matching.
@@ -160,15 +157,11 @@ func TestLookoutBreachMatching(t *testing.T) {
 
 	// Encrypt the first justice kit under breach key one.
 	encBlob1, err := blob1.Encrypt(key1)
-	if err != nil {
-		t.Fatalf("unable to encrypt sweep detail 1: %v", err)
-	}
+	require.NoError(t, err, "unable to encrypt sweep detail 1")
 
 	// Encrypt the second justice kit under breach key two.
 	encBlob2, err := blob2.Encrypt(key2)
-	if err != nil {
-		t.Fatalf("unable to encrypt sweep detail 2: %v", err)
-	}
+	require.NoError(t, err, "unable to encrypt sweep detail 2")
 
 	// Add both state updates to the tower's database.
 	txBlob1 := &wtdb.SessionStateUpdate{

watchtower/wtclient/backup_task_internal_test.go

@@ -23,6 +23,7 @@ import (
 	"github.com/lightningnetwork/lnd/watchtower/wtdb"
 	"github.com/lightningnetwork/lnd/watchtower/wtmock"
 	"github.com/lightningnetwork/lnd/watchtower/wtpolicy"
+	"github.com/stretchr/testify/require"
 )
 
 const csvDelay uint32 = 144
@@ -602,9 +603,7 @@ func testBackupTask(t *testing.T, test backupTaskTest) {
 	// Now, we'll construct, sign, and encrypt the blob containing the parts
 	// needed to reconstruct the justice transaction.
 	hint, encBlob, err := task.craftSessionPayload(test.signer)
-	if err != nil {
-		t.Fatalf("unable to craft session payload: %v", err)
-	}
+	require.NoError(t, err, "unable to craft session payload")
 
 	// Verify that the breach hint matches the breach txid's prefix.
 	breachTxID := test.breachInfo.BreachTxHash
@@ -618,9 +617,7 @@ func testBackupTask(t *testing.T, test backupTaskTest) {
 	// contents.
 	key := blob.NewBreachKeyFromHash(&breachTxID)
 	jKit, err := blob.Decrypt(key, encBlob, policy.BlobType)
-	if err != nil {
-		t.Fatalf("unable to decrypt blob: %v", err)
-	}
+	require.NoError(t, err, "unable to decrypt blob")
 
 	keyRing := test.breachInfo.KeyRing
 	expToLocalPK := keyRing.ToLocalKey.SerializeCompressed()

watchtower/wtclient/candidate_iterator_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/davecgh/go-spew/spew"
 	"github.com/lightningnetwork/lnd/watchtower/wtdb"
+	"github.com/stretchr/testify/require"
 )
 
 func init() {
@@ -35,9 +36,7 @@ func randAddr(t *testing.T) net.Addr {
 
 func randTower(t *testing.T) *wtdb.Tower {
 	priv, err := btcec.NewPrivateKey()
-	if err != nil {
-		t.Fatalf("unable to create private key: %v", err)
-	}
+	require.NoError(t, err, "unable to create private key")
 	pubKey := priv.PubKey()
 	return &wtdb.Tower{
 		ID:          wtdb.TowerID(rand.Uint64()),

watchtower/wtclient/client_test.go

@@ -69,9 +69,7 @@ func randPrivKey(t *testing.T) *btcec.PrivateKey {
 	t.Helper()
 
 	sk, err := btcec.NewPrivateKey()
-	if err != nil {
-		t.Fatalf("unable to generate pubkey: %v", err)
-	}
+	require.NoError(t, err, "unable to generate pubkey")
 
 	return sk
 }
@@ -200,21 +198,15 @@ func (c *mockChannel) createRemoteCommitTx(t *testing.T) {
 	toLocalScript, err := input.CommitScriptToSelf(
 		c.csvDelay, c.toLocalPK, c.revPK,
 	)
-	if err != nil {
-		t.Fatalf("unable to create to-local script: %v", err)
-	}
+	require.NoError(t, err, "unable to create to-local script")
 
 	// Compute the to-local witness script hash.
 	toLocalScriptHash, err := input.WitnessScriptHash(toLocalScript)
-	if err != nil {
-		t.Fatalf("unable to create to-local witness script hash: %v", err)
-	}
+	require.NoError(t, err, "unable to create to-local witness script hash")
 
 	// Compute the to-remote witness script hash.
 	toRemoteScriptHash, err := input.CommitScriptUnencumbered(c.toRemotePK)
-	if err != nil {
-		t.Fatalf("unable to create to-remote script: %v", err)
-	}
+	require.NoError(t, err, "unable to create to-remote script")
 
 	// Construct the remote commitment txn, containing the to-local and
 	// to-remote outputs. The balances are flipped since the transaction is
@@ -400,14 +392,10 @@ type harnessCfg struct {
 
 func newHarness(t *testing.T, cfg harnessCfg) *testHarness {
 	towerTCPAddr, err := net.ResolveTCPAddr("tcp", towerAddrStr)
-	if err != nil {
-		t.Fatalf("Unable to resolve tower TCP addr: %v", err)
-	}
+	require.NoError(t, err, "Unable to resolve tower TCP addr")
 
 	privKey, err := btcec.NewPrivateKey()
-	if err != nil {
-		t.Fatalf("Unable to generate tower private key: %v", err)
-	}
+	require.NoError(t, err, "Unable to generate tower private key")
 	privKeyECDH := &keychain.PrivKeyECDH{PrivKey: privKey}
 
 	towerPubKey := privKey.PubKey()
@@ -432,9 +420,7 @@ func newHarness(t *testing.T, cfg harnessCfg) *testHarness {
 	}
 
 	server, err := wtserver.New(serverCfg)
-	if err != nil {
-		t.Fatalf("unable to create wtserver: %v", err)
-	}
+	require.NoError(t, err, "unable to create wtserver")
 
 	signer := wtmock.NewMockSigner()
 	mockNet := newMockNet(server.InboundPeerConnected)
@@ -457,9 +443,7 @@ func newHarness(t *testing.T, cfg harnessCfg) *testHarness {
 		ForceQuitDelay: 10 * time.Second,
 	}
 	client, err := wtclient.New(clientCfg)
-	if err != nil {
-		t.Fatalf("Unable to create wtclient: %v", err)
-	}
+	require.NoError(t, err, "Unable to create wtclient")
 
 	if err := server.Start(); err != nil {
 		t.Fatalf("Unable to start wtserver: %v", err)

watchtower/wtserver/server_test.go

@@ -16,6 +16,7 @@ import (
 	"github.com/lightningnetwork/lnd/watchtower/wtmock"
 	"github.com/lightningnetwork/lnd/watchtower/wtserver"
 	"github.com/lightningnetwork/lnd/watchtower/wtwire"
+	"github.com/stretchr/testify/require"
 )
 
 var (
@@ -36,9 +37,7 @@ func randPubKey(t *testing.T) *btcec.PublicKey {
 	t.Helper()
 
 	sk, err := btcec.NewPrivateKey()
-	if err != nil {
-		t.Fatalf("unable to generate pubkey: %v", err)
-	}
+	require.NoError(t, err, "unable to generate pubkey")
 
 	return sk.PubKey()
 }
@@ -63,9 +62,7 @@ func initServer(t *testing.T, db wtserver.DB,
 		},
 		ChainHash: testnetChainHash,
 	})
-	if err != nil {
-		t.Fatalf("unable to create server: %v", err)
-	}
+	require.NoError(t, err, "unable to create server")
 
 	if err = s.Start(); err != nil {
 		t.Fatalf("unable to start server: %v", err)
@@ -101,9 +98,7 @@ func TestServerOnlyAcceptOnePeer(t *testing.T) {
 
 	var b bytes.Buffer
 	_, err := wtwire.WriteMessage(&b, init, 0)
-	if err != nil {
-		t.Fatalf("unable to write message: %v", err)
-	}
+	require.NoError(t, err, "unable to write message")
 
 	msg := b.Bytes()