mirror/lnd
1
0 Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

cnct: convert supplement functions to methods

Browse Source
This commit is contained in:
Joost Jager committed 2019-09-04 19:20:11 +02:00
1 parent 4fe846af6e
commit 5871d69bde
1 file changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files
contractcourt/channel_arbitrator.go
+8 -8
View File
@@ -479,7 +479,7 @@ func (c *ChannelArbitrator) relaunchResolvers() error {
"resolvers", c.cfg.ChanPoint, len(unresolvedContracts)) "resolvers", c.cfg.ChanPoint, len(unresolvedContracts))
for _, resolver := range unresolvedContracts { for _, resolver := range unresolvedContracts {
supplementResolver(resolver, htlcMap) c.supplementResolver(resolver, htlcMap)
} }
c.launchResolvers(unresolvedContracts) c.launchResolvers(unresolvedContracts)
@@ -489,24 +489,24 @@ func (c *ChannelArbitrator) relaunchResolvers() error {
// supplementResolver takes a resolver as it is restored from the log and fills // supplementResolver takes a resolver as it is restored from the log and fills
// in missing data from the htlcMap. // in missing data from the htlcMap.
func supplementResolver(resolver ContractResolver, func (c *ChannelArbitrator) supplementResolver(resolver ContractResolver,
htlcMap map[wire.OutPoint]*channeldb.HTLC) error { htlcMap map[wire.OutPoint]*channeldb.HTLC) error {
switch r := resolver.(type) { switch r := resolver.(type) {
case *htlcSuccessResolver: case *htlcSuccessResolver:
return supplementSuccessResolver(r, htlcMap) return c.supplementSuccessResolver(r, htlcMap)
case *htlcIncomingContestResolver: case *htlcIncomingContestResolver:
return supplementSuccessResolver( return c.supplementSuccessResolver(
&r.htlcSuccessResolver, htlcMap, &r.htlcSuccessResolver, htlcMap,
) )
case *htlcTimeoutResolver: case *htlcTimeoutResolver:
return supplementTimeoutResolver(r, htlcMap) return c.supplementTimeoutResolver(r, htlcMap)
case *htlcOutgoingContestResolver: case *htlcOutgoingContestResolver:
return supplementTimeoutResolver( return c.supplementTimeoutResolver(
&r.htlcTimeoutResolver, htlcMap, &r.htlcTimeoutResolver, htlcMap,
) )
} }
@@ -516,7 +516,7 @@ func supplementResolver(resolver ContractResolver,
// supplementSuccessResolver takes a htlcSuccessResolver as it is restored from // supplementSuccessResolver takes a htlcSuccessResolver as it is restored from
// the log and fills in missing data from the htlcMap. // the log and fills in missing data from the htlcMap.
func supplementSuccessResolver(r *htlcSuccessResolver, func (c *ChannelArbitrator) supplementSuccessResolver(r *htlcSuccessResolver,
htlcMap map[wire.OutPoint]*channeldb.HTLC) error { htlcMap map[wire.OutPoint]*channeldb.HTLC) error {
res := r.htlcResolution res := r.htlcResolution
@@ -533,7 +533,7 @@ func supplementSuccessResolver(r *htlcSuccessResolver,
// supplementTimeoutResolver takes a htlcSuccessResolver as it is restored from // supplementTimeoutResolver takes a htlcSuccessResolver as it is restored from
// the log and fills in missing data from the htlcMap. // the log and fills in missing data from the htlcMap.
func supplementTimeoutResolver(r *htlcTimeoutResolver, func (c *ChannelArbitrator) supplementTimeoutResolver(r *htlcTimeoutResolver,
htlcMap map[wire.OutPoint]*channeldb.HTLC) error { htlcMap map[wire.OutPoint]*channeldb.HTLC) error {
res := r.htlcResolution res := r.htlcResolution