diff --git a/contractcourt/htlc_incoming_contest_resolver.go b/contractcourt/htlc_incoming_contest_resolver.go index 3c66fdc6..9d026cd0 100644 --- a/contractcourt/htlc_incoming_contest_resolver.go +++ b/contractcourt/htlc_incoming_contest_resolver.go @@ -169,8 +169,8 @@ func (h *htlcIncomingContestResolver) Resolve() (ContractResolver, error) { // Define closure to process htlc resolutions either direct or triggered by // later notification. - processHodlEvent := func(e invoices.HtlcResolution) (ContractResolver, - error) { + processHtlcResolution := func(e invoices.HtlcResolution) ( + ContractResolver, error) { if e.Preimage == nil { log.Infof("%T(%v): Exit hop HTLC canceled "+ @@ -212,7 +212,7 @@ func (h *htlcIncomingContestResolver) Resolve() (ContractResolver, error) { // Resolve the htlc directly if possible. if event != nil { - return processHodlEvent(*event) + return processHtlcResolution(*event) } default: return nil, err @@ -254,7 +254,7 @@ func (h *htlcIncomingContestResolver) Resolve() (ContractResolver, error) { case hodlItem := <-hodlChan: htlcResolution := hodlItem.(invoices.HtlcResolution) - return processHodlEvent(htlcResolution) + return processHtlcResolution(htlcResolution) case newBlock, ok := <-blockEpochs.Epochs: if !ok { diff --git a/htlcswitch/link.go b/htlcswitch/link.go index a262ff21..a1913381 100644 --- a/htlcswitch/link.go +++ b/htlcswitch/link.go @@ -1164,7 +1164,7 @@ loop: return fmt.Errorf("hodl htlc not found: %v", circuitKey) } - if err := l.processHodlEvent(htlcResolution, hodlHtlc); err != nil { + if err := l.processHtlcResolution(htlcResolution, hodlHtlc); err != nil { return err } @@ -1187,9 +1187,10 @@ loop: return nil } -// processHodlEvent applies a received htlc resolution to the provided htlc. -// When this function returns without an error, the commit tx should be updated. -func (l *channelLink) processHodlEvent(resolution invoices.HtlcResolution, +// processHtlcResolution applies a received htlc resolution to the provided +// htlc. When this function returns without an error, the commit tx should be +// updated. +func (l *channelLink) processHtlcResolution(resolution invoices.HtlcResolution, htlc hodlHtlc) error { circuitKey := resolution.CircuitKey @@ -2851,7 +2852,7 @@ func (l *channelLink) processExitHop(pd *lnwallet.PaymentDescriptor, } // Process the received resolution. - return l.processHodlEvent(*event, htlc) + return l.processHtlcResolution(*event, htlc) } // settleHTLC settles the HTLC on the channel.