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.
This commit is contained in:
yyforyongyu 2023-08-09 17:31:27 +08:00
parent aff4320208
commit a1671a8674
No known key found for this signature in database
GPG Key ID: 9BCD95C4FF296868

@ -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