From 5871d69bde477be9bf3a6431d210f8aafc7f0859 Mon Sep 17 00:00:00 2001 From: Joost Jager Date: Thu, 8 Aug 2019 15:29:07 +0200 Subject: [PATCH] cnct: convert supplement functions to methods --- contractcourt/channel_arbitrator.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contractcourt/channel_arbitrator.go b/contractcourt/channel_arbitrator.go index 7bb1899c2..34d75b336 100644 --- a/contractcourt/channel_arbitrator.go +++ b/contractcourt/channel_arbitrator.go @@ -479,7 +479,7 @@ func (c *ChannelArbitrator) relaunchResolvers() error { "resolvers", c.cfg.ChanPoint, len(unresolvedContracts)) for _, resolver := range unresolvedContracts { - supplementResolver(resolver, htlcMap) + c.supplementResolver(resolver, htlcMap) } 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 // in missing data from the htlcMap. -func supplementResolver(resolver ContractResolver, +func (c *ChannelArbitrator) supplementResolver(resolver ContractResolver, htlcMap map[wire.OutPoint]*channeldb.HTLC) error { switch r := resolver.(type) { case *htlcSuccessResolver: - return supplementSuccessResolver(r, htlcMap) + return c.supplementSuccessResolver(r, htlcMap) case *htlcIncomingContestResolver: - return supplementSuccessResolver( + return c.supplementSuccessResolver( &r.htlcSuccessResolver, htlcMap, ) case *htlcTimeoutResolver: - return supplementTimeoutResolver(r, htlcMap) + return c.supplementTimeoutResolver(r, htlcMap) case *htlcOutgoingContestResolver: - return supplementTimeoutResolver( + return c.supplementTimeoutResolver( &r.htlcTimeoutResolver, htlcMap, ) } @@ -516,7 +516,7 @@ func supplementResolver(resolver ContractResolver, // supplementSuccessResolver takes a htlcSuccessResolver as it is restored from // 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 { res := r.htlcResolution @@ -533,7 +533,7 @@ func supplementSuccessResolver(r *htlcSuccessResolver, // supplementTimeoutResolver takes a htlcSuccessResolver as it is restored from // 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 { res := r.htlcResolution