htlcswitch: remove a context.TODO

Author: ellemouton

htlcswitch/mailbox.go

@@ -109,7 +109,7 @@ type mailBoxConfig struct {
 
 	// failMailboxUpdate is used to fail an expired HTLC and use the
 	// correct SCID if the underlying channel uses aliases.
-	failMailboxUpdate func(outScid,
+	failMailboxUpdate func(ctx context.Context, outScid,
 		mailboxScid lnwire.ShortChannelID) lnwire.FailureMessage
 }
 
@@ -707,7 +707,7 @@ func (m *memoryMailBox) FailAdd(pkt *htlcPacket) {
 	// peer if this is a forward, or report to the user if the failed
 	// payment was locally initiated.
 	failure := m.cfg.failMailboxUpdate(
-		pkt.originalOutgoingChanID, m.cfg.shortChanID,
+		ctx, pkt.originalOutgoingChanID, m.cfg.shortChanID,
 	)
 
 	// If the payment was locally initiated (which is indicated by a nil
@@ -821,7 +821,7 @@ type mailOrchConfig struct {
 
 	// failMailboxUpdate is used to fail an expired HTLC and use the
 	// correct SCID if the underlying channel uses aliases.
-	failMailboxUpdate func(outScid,
+	failMailboxUpdate func(ctx context.Context, outScid,
 		mailboxScid lnwire.ShortChannelID) lnwire.FailureMessage
 }
 

htlcswitch/mailbox_test.go

@@ -207,7 +207,7 @@ func newMailboxContextWithClock(t *testing.T,
 		forwards: make(chan *htlcPacket, 1),
 	}
 
-	failMailboxUpdate := func(outScid,
+	failMailboxUpdate := func(_ context.Context, outScid,
 		mboxScid lnwire.ShortChannelID) lnwire.FailureMessage {
 
 		return &lnwire.FailTemporaryNodeFailure{}
@@ -233,7 +233,7 @@ func newMailboxContext(t *testing.T, startTime time.Time,
 		forwards: make(chan *htlcPacket, 1),
 	}
 
-	failMailboxUpdate := func(outScid,
+	failMailboxUpdate := func(_ context.Context, outScid,
 		mboxScid lnwire.ShortChannelID) lnwire.FailureMessage {
 
 		return &lnwire.FailTemporaryNodeFailure{}
@@ -698,7 +698,7 @@ func testMailBoxDust(t *testing.T, chantype channeldb.ChannelType) {
 func TestMailOrchestrator(t *testing.T) {
 	t.Parallel()
 
-	failMailboxUpdate := func(outScid,
+	failMailboxUpdate := func(_ context.Context, outScid,
 		mboxScid lnwire.ShortChannelID) lnwire.FailureMessage {
 
 		return &lnwire.FailTemporaryNodeFailure{}

htlcswitch/switch.go

@@ -2640,11 +2640,9 @@ func (s *Switch) dustExceedsFeeThreshold(link ChannelLink,
 // used in the onion. The mailboxScid is the SCID that the mailbox and link
 // use. The mailboxScid is only used in the non-alias case, so it is always
 // the confirmed SCID.
-func (s *Switch) failMailboxUpdate(outgoingScid,
+func (s *Switch) failMailboxUpdate(ctx context.Context, outgoingScid,
 	mailboxScid lnwire.ShortChannelID) lnwire.FailureMessage {
 
-	ctx := context.TODO()
-
 	// Try to use the failAliasUpdate function in case this is a channel
 	// that uses aliases. If it returns nil, we'll fallback to the original
 	// pre-alias behavior.