Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix check node1Err !=nil but return a nil value error err #9377

Merged
merged 1 commit into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions brontide/noise_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions graph/db/graph.go
Original file line number Diff line number Diff line change
Expand Up @@ -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[:])
Expand All @@ -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
Expand Down
Loading