Skip to content

Commit 9a10c80

Browse files
tvolk131tvolk131
committed
multi: move many t.Fatalf calls to require.NoError
1 parent 9e6f0ef commit 9a10c80

File tree

92 files changed

+1906
-5566
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1906
-5566
lines changed

‎autopilot/agent_test.go

+9-24
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/btcsuite/btcd/btcec/v2"
1212
"github.com/btcsuite/btcd/btcutil"
1313
"github.com/btcsuite/btcd/wire"
14+
"github.com/stretchr/testify/require"
1415
)
1516

1617
type moreChansResp struct {
@@ -160,9 +161,7 @@ func setup(t *testing.T, initialChans []LocalChannel) (*testContext, func()) {
160161
// First, we'll create all the dependencies that we'll need in order to
161162
// create the autopilot agent.
162163
self, err := randKey()
163-
if err != nil {
164-
t.Fatalf("unable to generate key: %v", err)
165-
}
164+
require.NoError(t, err, "unable to generate key")
166165

167166
quit := make(chan struct{})
168167
heuristic := &mockHeuristic{
@@ -216,9 +215,7 @@ func setup(t *testing.T, initialChans []LocalChannel) (*testContext, func()) {
216215
}
217216

218217
agent, err := New(testCfg, initialChans)
219-
if err != nil {
220-
t.Fatalf("unable to create agent: %v", err)
221-
}
218+
require.NoError(t, err, "unable to create agent")
222219
ctx.agent = agent
223220

224221
// With the autopilot agent and all its dependencies we'll start the
@@ -331,9 +328,7 @@ func TestAgentHeuristicUpdateSignal(t *testing.T) {
331328
defer cleanup()
332329

333330
pub, err := testCtx.graph.addRandNode()
334-
if err != nil {
335-
t.Fatalf("unable to generate key: %v", err)
336-
}
331+
require.NoError(t, err, "unable to generate key")
337332

338333
// We'll send an initial "no" response to advance the agent past its
339334
// initial check.
@@ -397,9 +392,7 @@ func TestAgentChannelFailureSignal(t *testing.T) {
397392
testCtx.chanController = &mockFailingChanController{}
398393

399394
node, err := testCtx.graph.addRandNode()
400-
if err != nil {
401-
t.Fatalf("unable to add node: %v", err)
402-
}
395+
require.NoError(t, err, "unable to add node")
403396

404397
// First ensure the agent will attempt to open a new channel. Return
405398
// that we need more channels, and have 5BTC to use.
@@ -664,9 +657,7 @@ func TestAgentPendingChannelState(t *testing.T) {
664657

665658
// We'll only return a single directive for a pre-chosen node.
666659
nodeKey, err := testCtx.graph.addRandNode()
667-
if err != nil {
668-
t.Fatalf("unable to generate key: %v", err)
669-
}
660+
require.NoError(t, err, "unable to generate key")
670661
nodeID := NewNodeID(nodeKey)
671662
nodeDirective := &NodeScore{
672663
NodeID: nodeID,
@@ -876,9 +867,7 @@ func TestAgentSkipPendingConns(t *testing.T) {
876867

877868
// We'll only return a single directive for a pre-chosen node.
878869
nodeKey, err := testCtx.graph.addRandNode()
879-
if err != nil {
880-
t.Fatalf("unable to generate key: %v", err)
881-
}
870+
require.NoError(t, err, "unable to generate key")
882871
nodeID := NewNodeID(nodeKey)
883872
nodeDirective := &NodeScore{
884873
NodeID: nodeID,
@@ -888,9 +877,7 @@ func TestAgentSkipPendingConns(t *testing.T) {
888877
// We'll also add a second node to the graph, to keep the first one
889878
// company.
890879
nodeKey2, err := testCtx.graph.addRandNode()
891-
if err != nil {
892-
t.Fatalf("unable to generate key: %v", err)
893-
}
880+
require.NoError(t, err, "unable to generate key")
894881
nodeID2 := NewNodeID(nodeKey2)
895882

896883
// We'll send an initial "yes" response to advance the agent past its
@@ -1062,9 +1049,7 @@ func TestAgentQuitWhenPendingConns(t *testing.T) {
10621049

10631050
// We'll only return a single directive for a pre-chosen node.
10641051
nodeKey, err := testCtx.graph.addRandNode()
1065-
if err != nil {
1066-
t.Fatalf("unable to generate key: %v", err)
1067-
}
1052+
require.NoError(t, err, "unable to generate key")
10681053
nodeID := NewNodeID(nodeKey)
10691054
nodeDirective := &NodeScore{
10701055
NodeID: nodeID,

‎autopilot/prefattach_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/btcsuite/btcd/btcec/v2"
1212
"github.com/btcsuite/btcd/btcutil"
1313
"github.com/lightningnetwork/lnd/channeldb"
14+
"github.com/stretchr/testify/require"
1415
)
1516

1617
type genGraphFunc func() (testGraph, func(), error)
@@ -77,9 +78,7 @@ func TestPrefAttachmentSelectEmptyGraph(t *testing.T) {
7778

7879
// Create a random public key, which we will query to get a score for.
7980
pub, err := randKey()
80-
if err != nil {
81-
t.Fatalf("unable to generate key: %v", err)
82-
}
81+
require.NoError(t, err, "unable to generate key")
8382

8483
nodes := map[NodeID]struct{}{
8584
NewNodeID(pub): {},

‎brontide/noise_test.go

+17-48
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"github.com/lightningnetwork/lnd/keychain"
1515
"github.com/lightningnetwork/lnd/lnwire"
1616
"github.com/lightningnetwork/lnd/tor"
17+
"github.com/stretchr/testify/require"
1718
)
1819

1920
type maybeNetConn struct {
@@ -103,9 +104,7 @@ func TestConnectionCorrectness(t *testing.T) {
103104
// into local variables. If the initial crypto handshake fails, then
104105
// we'll get a non-nil error here.
105106
localConn, remoteConn, cleanUp, err := establishTestConnection()
106-
if err != nil {
107-
t.Fatalf("unable to establish test connection: %v", err)
108-
}
107+
require.NoError(t, err, "unable to establish test connection")
109108
defer cleanUp()
110109

111110
// Test out some message full-message reads.
@@ -155,9 +154,7 @@ func TestConnectionCorrectness(t *testing.T) {
155154
// stalled.
156155
func TestConcurrentHandshakes(t *testing.T) {
157156
listener, netAddr, err := makeListener()
158-
if err != nil {
159-
t.Fatalf("unable to create listener connection: %v", err)
160-
}
157+
require.NoError(t, err, "unable to create listener connection")
161158
defer listener.Close()
162159

163160
const nblocking = 5
@@ -194,9 +191,7 @@ func TestConcurrentHandshakes(t *testing.T) {
194191
// Now, construct a new private key and use the brontide dialer to
195192
// connect to the listener.
196193
remotePriv, err := btcec.NewPrivateKey()
197-
if err != nil {
198-
t.Fatalf("unable to generate private key: %v", err)
199-
}
194+
require.NoError(t, err, "unable to generate private key")
200195
remoteKeyECDH := &keychain.PrivKeyECDH{PrivKey: remotePriv}
201196

202197
go func() {
@@ -210,9 +205,7 @@ func TestConcurrentHandshakes(t *testing.T) {
210205
// This connection should be accepted without error, as the brontide
211206
// connection should bypass stalled tcp connections.
212207
conn, err := listener.Accept()
213-
if err != nil {
214-
t.Fatalf("unable to accept dial: %v", err)
215-
}
208+
require.NoError(t, err, "unable to accept dial")
216209
defer conn.Close()
217210

218211
result := <-connChan
@@ -265,9 +258,7 @@ func TestWriteMessageChunking(t *testing.T) {
265258
// into local variables. If the initial crypto handshake fails, then
266259
// we'll get a non-nil error here.
267260
localConn, remoteConn, cleanUp, err := establishTestConnection()
268-
if err != nil {
269-
t.Fatalf("unable to establish test connection: %v", err)
270-
}
261+
require.NoError(t, err, "unable to establish test connection")
271262
defer cleanUp()
272263

273264
// Attempt to write a message which is over 3x the max allowed payload
@@ -322,9 +313,7 @@ func TestBolt0008TestVectors(t *testing.T) {
322313
// vectors at the appendix of BOLT-0008
323314
initiatorKeyBytes, err := hex.DecodeString("1111111111111111111111" +
324315
"111111111111111111111111111111111111111111")
325-
if err != nil {
326-
t.Fatalf("unable to decode hex: %v", err)
327-
}
316+
require.NoError(t, err, "unable to decode hex")
328317
initiatorPriv, _ := btcec.PrivKeyFromBytes(
329318
initiatorKeyBytes,
330319
)
@@ -333,9 +322,7 @@ func TestBolt0008TestVectors(t *testing.T) {
333322
// We'll then do the same for the responder.
334323
responderKeyBytes, err := hex.DecodeString("212121212121212121212121" +
335324
"2121212121212121212121212121212121212121")
336-
if err != nil {
337-
t.Fatalf("unable to decode hex: %v", err)
338-
}
325+
require.NoError(t, err, "unable to decode hex")
339326
responderPriv, responderPub := btcec.PrivKeyFromBytes(
340327
responderKeyBytes,
341328
)
@@ -382,15 +369,11 @@ func TestBolt0008TestVectors(t *testing.T) {
382369
// the payload return is _exactly_ the same as what's specified within
383370
// the test vectors.
384371
actOne, err := initiator.GenActOne()
385-
if err != nil {
386-
t.Fatalf("unable to generate act one: %v", err)
387-
}
372+
require.NoError(t, err, "unable to generate act one")
388373
expectedActOne, err := hex.DecodeString("00036360e856310ce5d294e" +
389374
"8be33fc807077dc56ac80d95d9cd4ddbd21325eff73f70df608655115" +
390375
"1f58b8afe6c195782c6a")
391-
if err != nil {
392-
t.Fatalf("unable to parse expected act one: %v", err)
393-
}
376+
require.NoError(t, err, "unable to parse expected act one")
394377
if !bytes.Equal(expectedActOne, actOne[:]) {
395378
t.Fatalf("act one mismatch: expected %x, got %x",
396379
expectedActOne, actOne)
@@ -407,15 +390,11 @@ func TestBolt0008TestVectors(t *testing.T) {
407390
// produce the _exact_ same byte stream as advertised within the spec's
408391
// test vectors.
409392
actTwo, err := responder.GenActTwo()
410-
if err != nil {
411-
t.Fatalf("unable to generate act two: %v", err)
412-
}
393+
require.NoError(t, err, "unable to generate act two")
413394
expectedActTwo, err := hex.DecodeString("0002466d7fcae563e5cb09a0" +
414395
"d1870bb580344804617879a14949cf22285f1bae3f276e2470b93aac58" +
415396
"3c9ef6eafca3f730ae")
416-
if err != nil {
417-
t.Fatalf("unable to parse expected act two: %v", err)
418-
}
397+
require.NoError(t, err, "unable to parse expected act two")
419398
if !bytes.Equal(expectedActTwo, actTwo[:]) {
420399
t.Fatalf("act two mismatch: expected %x, got %x",
421400
expectedActTwo, actTwo)
@@ -430,15 +409,11 @@ func TestBolt0008TestVectors(t *testing.T) {
430409
// At the final step, we'll generate the last act from the initiator
431410
// and once again verify that it properly matches the test vectors.
432411
actThree, err := initiator.GenActThree()
433-
if err != nil {
434-
t.Fatalf("unable to generate act three: %v", err)
435-
}
412+
require.NoError(t, err, "unable to generate act three")
436413
expectedActThree, err := hex.DecodeString("00b9e3a702e93e3a9948c2e" +
437414
"d6e5fd7590a6e1c3a0344cfc9d5b57357049aa22355361aa02e55a8f" +
438415
"c28fef5bd6d71ad0c38228dc68b1c466263b47fdf31e560e139ba")
439-
if err != nil {
440-
t.Fatalf("unable to parse expected act three: %v", err)
441-
}
416+
require.NoError(t, err, "unable to parse expected act three")
442417
if !bytes.Equal(expectedActThree, actThree[:]) {
443418
t.Fatalf("act three mismatch: expected %x, got %x",
444419
expectedActThree, actThree)
@@ -454,20 +429,14 @@ func TestBolt0008TestVectors(t *testing.T) {
454429
// proper symmetric encryption keys.
455430
sendingKey, err := hex.DecodeString("969ab31b4d288cedf6218839b27a3e2" +
456431
"140827047f2c0f01bf5c04435d43511a9")
457-
if err != nil {
458-
t.Fatalf("unable to parse sending key: %v", err)
459-
}
432+
require.NoError(t, err, "unable to parse sending key")
460433
recvKey, err := hex.DecodeString("bb9020b8965f4df047e07f955f3c4b884" +
461434
"18984aadc5cdb35096b9ea8fa5c3442")
462-
if err != nil {
463-
t.Fatalf("unable to parse receiving key: %v", err)
464-
}
435+
require.NoError(t, err, "unable to parse receiving key")
465436

466437
chainKey, err := hex.DecodeString("919219dbb2920afa8db80f9a51787a840" +
467438
"bcf111ed8d588caf9ab4be716e42b01")
468-
if err != nil {
469-
t.Fatalf("unable to parse chaining key: %v", err)
470-
}
439+
require.NoError(t, err, "unable to parse chaining key")
471440

472441
if !bytes.Equal(initiator.sendCipher.secretKey[:], sendingKey) {
473442
t.Fatalf("sending key mismatch: expected %x, got %x",

0 commit comments

Comments
 (0)