Skip to content

Commit 8597ee3

Browse files
authored
Merge pull request #1063 from Roasbeef/always-funding-unlock
tapchannel: use new context for call to unlockLeases
2 parents ae0f1ce + e620288 commit 8597ee3

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

tapchannel/aux_funding_controller.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,14 +1396,13 @@ func (f *FundingController) processFundingReq(fundingFlows fundingFlowIndex,
13961396
// We'll use this closure to ensure that we'll always unlock the inputs
13971397
// if we encounter an error below.
13981398
unlockLeases := func() {
1399-
err := fundingState.unlockInputs(fundReq.ctx, f.cfg.ChainWallet)
1399+
ctxb := context.Background()
1400+
err := fundingState.unlockInputs(ctxb, f.cfg.ChainWallet)
14001401
if err != nil {
14011402
log.Errorf("unable to unlock inputs: %v", err)
14021403
}
14031404

1404-
err = fundingState.unlockAssetInputs(
1405-
fundReq.ctx, f.cfg.CoinSelector,
1406-
)
1405+
err = fundingState.unlockAssetInputs(ctxb, f.cfg.CoinSelector)
14071406
if err != nil {
14081407
log.Errorf("Unable to unlock asset inputs: %v", err)
14091408
}

0 commit comments

Comments
 (0)