mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-01-18 21:35:24 +01:00
Code Issues Projects Releases Wiki Activity

cmd/lncli/walletrpc_active.go: avoid nested getContext [skip ci]

Browse Source 
Pass down a context from bumpCloseFee to getWaitingCloseCommitments,
to avoid another call to getContext that used to fail with "intercept
already active"
This commit is contained in:
Anton Kovalenko 2022-11-17 00:21:54 +03:00
parent 478b012672
commit 2700c97d2b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/lncli/walletrpc_active.go
View File

@ -5,6 +5,7 @@ package main
import (
"bytes"
"context"
"encoding/base64"
"encoding/hex"
"encoding/json"
@ -320,7 +321,9 @@ func bumpCloseFee(ctx *cli.Context) error {
defer cleanUp()
// Fetch waiting close channel commitments.
commitments, err := getWaitingCloseCommitments(client, channelPoint)
commitments, err := getWaitingCloseCommitments(
ctxc, client, channelPoint,
)
if err != nil {
return err
}
@ -379,11 +382,9 @@ func bumpCloseFee(ctx *cli.Context) error {
return nil
}
func getWaitingCloseCommitments(client lnrpc.LightningClient,
channelPoint string) (*lnrpc.PendingChannelsResponse_Commitments,
error) {
ctxc := getContext()
func getWaitingCloseCommitments(ctxc context.Context,
client lnrpc.LightningClient, channelPoint string) (
*lnrpc.PendingChannelsResponse_Commitments, error) {
req := &lnrpc.PendingChannelsRequest{}
resp, err := client.PendingChannels(ctxc, req)