From a1671a86746728c520c30ee42def2922e6dc2adb Mon Sep 17 00:00:00 2001 From: yyforyongyu Date: Wed, 9 Aug 2023 17:31:27 +0800 Subject: [PATCH] contractcourt: rename `htlcResolvers` to `resolvers` This commit changes the name returned from `prepContractResolutions` from `htlcResolvers` to `resolvers` to avoid confusion as there are multiple types of resolvers returned. --- contractcourt/channel_arbitrator.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contractcourt/channel_arbitrator.go b/contractcourt/channel_arbitrator.go index 74987b629..37395f93a 100644 --- a/contractcourt/channel_arbitrator.go +++ b/contractcourt/channel_arbitrator.go @@ -1090,10 +1090,10 @@ func (c *ChannelArbitrator) stateStep( break } - // Now that we know we'll need to act, we'll process the htlc - // actions, then create the structures we need to resolve all + // Now that we know we'll need to act, we'll process all the + // resolvers, then create the structures we need to resolve all // outstanding contracts. - htlcResolvers, pktsToSend, err := c.prepContractResolutions( + resolvers, pktsToSend, err := c.prepContractResolutions( contractResolutions, triggerHeight, trigger, confCommitSet, ) @@ -1120,16 +1120,16 @@ func (c *ChannelArbitrator) stateStep( } log.Debugf("ChannelArbitrator(%v): inserting %v contract "+ - "resolvers", c.cfg.ChanPoint, len(htlcResolvers)) + "resolvers", c.cfg.ChanPoint, len(resolvers)) - err = c.log.InsertUnresolvedContracts(nil, htlcResolvers...) + err = c.log.InsertUnresolvedContracts(nil, resolvers...) if err != nil { return StateError, closeTx, err } // Finally, we'll launch all the required contract resolvers. // Once they're all resolved, we're no longer needed. - c.launchResolvers(htlcResolvers) + c.launchResolvers(resolvers) nextState = StateWaitingFullResolution