GlcoinCore/loop
1
0
Fork 0
mirror of https://github.com/lightninglabs/loop.git synced 2026-08-13 12:33:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

swap: add constructor for swap config

Browse source
This commit is contained in:
carla 2020-06-08 12:53:07 +02:00
parent 9571371153
commit 2ebbc78131
No known key found for this signature in database
GPG key ID: 4CA7FE54A6213C91
4 changed files with 22 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

19
client.go
View file

@ -315,10 +315,7 @@ func (s *Client) Run(ctx context.Context,
func (s *Client) resumeSwaps(ctx context.Context,
loopOutSwaps []*loopdb.LoopOut, loopInSwaps []*loopdb.LoopIn) {
swapCfg := &swapConfig{
lnd: s.lndServices,
store: s.Store,
}
swapCfg := newSwapConfig(s.lndServices, s.Store, s.Server)
for _, pend := range loopOutSwaps {
if pend.State().State.Type() != loopdb.StateTypePending {
@ -369,11 +366,7 @@ func (s *Client) LoopOut(globalCtx context.Context,
// Create a new swap object for this swap.
initiationHeight := s.executor.height()
swapCfg := &swapConfig{
lnd: s.lndServices,
store: s.Store,
server: s.Server,
}
swapCfg := newSwapConfig(s.lndServices, s.Store, s.Server)
swap, err := newLoopOutSwap(
globalCtx, swapCfg, initiationHeight, request,
)
@ -486,13 +479,9 @@ func (s *Client) LoopIn(globalCtx context.Context,
// Create a new swap object for this swap.
initiationHeight := s.executor.height()
swapCfg := swapConfig{
lnd: s.lndServices,
store: s.Store,
server: s.Server,
}
swapCfg := newSwapConfig(s.lndServices, s.Store, s.Server)
swap, err := newLoopInSwap(
globalCtx, &swapCfg, initiationHeight, request,
globalCtx, swapCfg, initiationHeight, request,
)
if err != nil {
return nil, err

19
loopin_test.go
View file

@ -32,11 +32,7 @@ func TestLoopInSuccess(t *testing.T) {
height := int32(600)
cfg := &swapConfig{
lnd: &ctx.lnd.LndServices,
store: ctx.store,
server: ctx.server,
}
cfg := newSwapConfig(&ctx.lnd.LndServices, ctx.store, ctx.server)
swap, err := newLoopInSwap(
context.Background(), cfg,
@ -151,11 +147,7 @@ func testLoopInTimeout(t *testing.T,
height := int32(600)
cfg := &swapConfig{
lnd: &ctx.lnd.LndServices,
store: ctx.store,
server: ctx.server,
}
cfg := newSwapConfig(&ctx.lnd.LndServices, ctx.store, ctx.server)
req := testLoopInRequest
if externalValue != 0 {
@ -282,12 +274,7 @@ func testLoopInResume(t *testing.T, state loopdb.SwapState, expired bool) {
defer test.Guard(t)()
ctx := newLoopInTestContext(t)
cfg := &swapConfig{
lnd: &ctx.lnd.LndServices,
store: ctx.store,
server: ctx.server,
}
cfg := newSwapConfig(&ctx.lnd.LndServices, ctx.store, ctx.server)
senderKey := [33]byte{4}
receiverKey := [33]byte{5}

15
loopout_test.go
View file

@ -145,11 +145,7 @@ func TestLateHtlcPublish(t *testing.T) {
height := int32(600)
cfg := &swapConfig{
lnd: &lnd.LndServices,
store: store,
server: server,
}
cfg := newSwapConfig(&lnd.LndServices, store, server)
swap, err := newLoopOutSwap(
context.Background(), cfg, height, testRequest,
@ -231,11 +227,10 @@ func TestCustomSweepConfTarget(t *testing.T) {
ctx.Lnd.SetFeeEstimate(testRequest.SweepConfTarget, 250)
ctx.Lnd.SetFeeEstimate(DefaultSweepConfTarget, 10000)
cfg := &swapConfig{
lnd: &lnd.LndServices,
store: newStoreMock(t),
server: newServerMock(),
}
cfg := newSwapConfig(
&lnd.LndServices, newStoreMock(t), newServerMock(),
)
swap, err := newLoopOutSwap(
context.Background(), cfg, ctx.Lnd.Height, testRequest,
)

10
swap.go
View file

@ -82,3 +82,13 @@ type swapConfig struct {
store loopdb.SwapStore
server swapServerClient
}
func newSwapConfig(lnd *lndclient.LndServices, store loopdb.SwapStore,
server swapServerClient) *swapConfig {
return &swapConfig{
lnd: lnd,
store: store,
server: server,
}
}