contractcourt/[incoming|outgoing]_contest_resolver: make inner resolver pointer

To make the linter happy, make a pointer to the inner resolver.
Otherwise the linter would complain with

copylocks: literal copies lock value

since we'll add a mutex to the resolver in following commits.
This commit is contained in:
Johan T. Halseth
2020-12-09 12:24:02 +01:00
parent 4da2b290f9
commit 9b08ef6d4e
5 changed files with 19 additions and 19 deletions

View File

@@ -31,7 +31,7 @@ type htlcIncomingContestResolver struct {
// htlcSuccessResolver is the inner resolver that may be utilized if we
// learn of the preimage.
htlcSuccessResolver
*htlcSuccessResolver
}
// newIncomingContestResolver instantiates a new incoming htlc contest resolver.
@@ -45,7 +45,7 @@ func newIncomingContestResolver(
return &htlcIncomingContestResolver{
htlcExpiry: htlc.RefundTimeout,
htlcSuccessResolver: *success,
htlcSuccessResolver: success,
}
}
@@ -189,7 +189,7 @@ func (h *htlcIncomingContestResolver) Resolve() (ContractResolver, error) {
return nil, err
}
return &h.htlcSuccessResolver, nil
return h.htlcSuccessResolver, nil
// If the htlc was failed, mark the htlc as
// resolved.
@@ -293,7 +293,7 @@ func (h *htlcIncomingContestResolver) Resolve() (ContractResolver, error) {
return nil, err
}
return &h.htlcSuccessResolver, nil
return h.htlcSuccessResolver, nil
}
witnessUpdates = preimageSubscription.WitnessUpdates
@@ -315,7 +315,7 @@ func (h *htlcIncomingContestResolver) Resolve() (ContractResolver, error) {
// We've learned of the preimage and this information
// has been added to our inner resolver. We return it so
// it can continue contract resolution.
return &h.htlcSuccessResolver, nil
return h.htlcSuccessResolver, nil
case hodlItem := <-hodlChan:
htlcResolution := hodlItem.(invoices.HtlcResolution)
@@ -420,7 +420,7 @@ func newIncomingContestResolverFromReader(r io.Reader, resCfg ResolverConfig) (
if err != nil {
return nil, err
}
h.htlcSuccessResolver = *successResolver
h.htlcSuccessResolver = successResolver
return h, nil
}