From a79fd082944f0295958debf53a2ee6b34746288b Mon Sep 17 00:00:00 2001 From: alingse Date: Thu, 19 Dec 2024 14:57:28 +0000 Subject: [PATCH] fix check node1Err !=nil but return a nil value error err Signed-off-by: alingse --- brontide/noise_test.go | 4 ++-- graph/db/graph.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/brontide/noise_test.go b/brontide/noise_test.go index 368d790df..fc4ff99e1 100644 --- a/brontide/noise_test.go +++ b/brontide/noise_test.go @@ -85,12 +85,12 @@ func establishTestConnection(t testing.TB) (net.Conn, net.Conn, error) { remote := <-remoteConnChan if remote.err != nil { - return nil, nil, err + return nil, nil, remote.err } local := <-localConnChan if local.err != nil { - return nil, nil, err + return nil, nil, local.err } t.Cleanup(func() { diff --git a/graph/db/graph.go b/graph/db/graph.go index 760896436..2a91398c6 100644 --- a/graph/db/graph.go +++ b/graph/db/graph.go @@ -1130,7 +1130,7 @@ func (c *ChannelGraph) addChannelEdge(tx kvdb.RwTx, "for: %x: %w", edge.NodeKey1Bytes, err) } case node1Err != nil: - return err + return node1Err } _, node2Err := fetchLightningNode(nodes, edge.NodeKey2Bytes[:]) @@ -1146,7 +1146,7 @@ func (c *ChannelGraph) addChannelEdge(tx kvdb.RwTx, "for: %x: %w", edge.NodeKey2Bytes, err) } case node2Err != nil: - return err + return node2Err } // If the edge hasn't been created yet, then we'll first add it to the