Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cnct: remove nursery dependency from success resolver #3977

Closed
wants to merge 3 commits into from
Closed

cnct: remove nursery dependency from success resolver #3977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
602e781
cnct: remove unused field in success resolver
joostjager Feb 3, 2020
9b6c181
cnct: do not copy success resolver
joostjager Feb 3, 2020
0bc598c
cnct: remove nursery dependency from success resolver
joostjager Feb 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions contractcourt/briefcase_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,6 @@ func assertResolversEqual(t *testing.T, originalResolver ContractResolver,
t.Fatalf("expected %v, got %v",
ogRes.outputIncubating, diskRes.outputIncubating)
}
if ogRes.resolved != diskRes.resolved {
t.Fatalf("expected %v, got %v", ogRes.resolved,
diskRes.resolved)
}
if ogRes.broadcastHeight != diskRes.broadcastHeight {
t.Fatalf("expected %v, got %v",
ogRes.broadcastHeight, diskRes.broadcastHeight)
Expand Down Expand Up @@ -208,7 +204,7 @@ func assertResolversEqual(t *testing.T, originalResolver ContractResolver,
case *htlcIncomingContestResolver:
diskRes := diskResolver.(*htlcIncomingContestResolver)
assertSuccessResEqual(
&ogRes.htlcSuccessResolver, &diskRes.htlcSuccessResolver,
ogRes.htlcSuccessResolver, diskRes.htlcSuccessResolver,
)

if ogRes.htlcExpiry != diskRes.htlcExpiry {
Expand Down Expand Up @@ -283,7 +279,6 @@ func TestContractInsertionRetrieval(t *testing.T) {
htlc: channeldb.HTLC{
RHash: testPreimage,
},
sweepTx: nil,
}
resolvers := []ContractResolver{
&timeoutResolver,
Expand Down Expand Up @@ -312,7 +307,7 @@ func TestContractInsertionRetrieval(t *testing.T) {
contestSuccess.htlcResolution.ClaimOutpoint = randOutPoint()
resolvers = append(resolvers, &htlcIncomingContestResolver{
htlcExpiry: 100,
htlcSuccessResolver: contestSuccess,
htlcSuccessResolver: &contestSuccess,
})

// For quick lookup during the test, we'll create this map which allow
Expand Down
12 changes: 6 additions & 6 deletions contractcourt/htlc_incoming_contest_resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,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.
Expand All @@ -44,7 +44,7 @@ func newIncomingContestResolver(

return &htlcIncomingContestResolver{
htlcExpiry: htlc.RefundTimeout,
htlcSuccessResolver: *success,
htlcSuccessResolver: success,
}
}

Expand Down Expand Up @@ -186,7 +186,7 @@ func (h *htlcIncomingContestResolver) Resolve() (ContractResolver, error) {
return nil, err
}

return &h.htlcSuccessResolver, nil
return h.htlcSuccessResolver, nil
}

// Create a buffered hodl chan to prevent deadlock.
Expand Down Expand Up @@ -232,7 +232,7 @@ func (h *htlcIncomingContestResolver) Resolve() (ContractResolver, error) {
return nil, err
}

return &h.htlcSuccessResolver, nil
return h.htlcSuccessResolver, nil
}

for {
Expand All @@ -252,7 +252,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)
Expand Down Expand Up @@ -352,7 +352,7 @@ func newIncomingContestResolverFromReader(r io.Reader, resCfg ResolverConfig) (
if err != nil {
return nil, err
}
h.htlcSuccessResolver = *successResolver
h.htlcSuccessResolver = successResolver

return h, nil
}
Expand Down
2 changes: 1 addition & 1 deletion contractcourt/htlc_incoming_resolver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ func newIncomingResolverTestContext(t *testing.T) *incomingResolverTestContext {
},
}
resolver := &htlcIncomingContestResolver{
htlcSuccessResolver: htlcSuccessResolver{
htlcSuccessResolver: &htlcSuccessResolver{
contractResolverKit: *newContractResolverKit(cfg),
htlcResolution: lnwallet.IncomingHtlcResolution{},
htlc: channeldb.HTLC{
Expand Down
Loading