Merge pull request #9377 from alingse/fix-nilnesserr

fix check node1Err !=nil but return a nil value error err
This commit is contained in:
Oliver Gugger 2024-12-20 09:26:38 +01:00 committed by GitHub
commit 03eab4db64
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions

View file

@ -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() {

View file

@ -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