htlcswitch+go.mod: use updated fn.ContextGuard

This commit updates the fn dep to the version containing the updates to
the ContextGuard implementation. Only the htlcswitch/link uses the guard
at the moment so this is updated to make use of the new implementation.
This commit is contained in:
Elle Mouton
2024-12-10 14:12:14 +02:00
parent 77848c402d
commit 950194a2da
7 changed files with 95 additions and 78 deletions

View File

@@ -2257,7 +2257,7 @@ func newSingleLinkTestHarness(t *testing.T, chanAmt,
for {
select {
case <-notifyUpdateChan:
case <-chanLink.Quit:
case <-chanLink.cg.Done():
close(doneChan)
return
}
@@ -2326,7 +2326,7 @@ func handleStateUpdate(link *channelLink,
}
link.HandleChannelUpdate(remoteRev)
ctx, done := link.WithCtxQuitNoTimeout()
ctx, done := link.cg.Create(context.Background())
defer done()
remoteSigs, err := remoteChannel.SignNextCommitment(ctx)
@@ -2372,7 +2372,7 @@ func updateState(batchTick chan time.Time, link *channelLink,
// Trigger update by ticking the batchTicker.
select {
case batchTick <- time.Now():
case <-link.Quit:
case <-link.cg.Done():
return fmt.Errorf("link shutting down")
}
return handleStateUpdate(link, remoteChannel)
@@ -2380,7 +2380,7 @@ func updateState(batchTick chan time.Time, link *channelLink,
// The remote is triggering the state update, emulate this by
// signing and sending CommitSig to the link.
ctx, done := link.WithCtxQuitNoTimeout()
ctx, done := link.cg.Create(context.Background())
defer done()
remoteSigs, err := remoteChannel.SignNextCommitment(ctx)
@@ -4946,7 +4946,7 @@ func (h *persistentLinkHarness) restartLink(
for {
select {
case <-notifyUpdateChan:
case <-chanLink.Quit:
case <-chanLink.cg.Done():
close(doneChan)
return
}
@@ -5932,7 +5932,9 @@ func TestChannelLinkFail(t *testing.T) {
// Sign a commitment that will include
// signature for the HTLC just sent.
quitCtx, done := c.WithCtxQuitNoTimeout()
quitCtx, done := c.cg.Create(
context.Background(),
)
defer done()
sigs, err := remoteChannel.SignNextCommitment(
@@ -5979,7 +5981,9 @@ func TestChannelLinkFail(t *testing.T) {
// Sign a commitment that will include
// signature for the HTLC just sent.
quitCtx, done := c.WithCtxQuitNoTimeout()
quitCtx, done := c.cg.Create(
context.Background(),
)
defer done()
sigs, err := remoteChannel.SignNextCommitment(