mirror of
https://github.com/lightningnetwork/lnd.git
synced 2025-04-06 02:58:03 +02:00
Merge pull request #9377 from alingse/fix-nilnesserr
fix check node1Err !=nil but return a nil value error err
This commit is contained in:
commit
03eab4db64
@ -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() {
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user