loop+cmd: extract types into swap module

This commit is contained in:
Oliver Gugger 2019-10-09 12:36:16 +02:00
parent 7a1680d7d6
commit 69f2af9fdc
No known key found for this signature in database
GPG key ID: 8E4256593F177720
13 changed files with 104 additions and 89 deletions

View file

@ -7,8 +7,6 @@ import (
"fmt"
"time"
"github.com/lightninglabs/loop/swap"
"github.com/btcsuite/btcutil"
"github.com/lightningnetwork/lnd/chainntnfs"
@ -19,6 +17,7 @@ import (
"github.com/lightninglabs/loop/lndclient"
"github.com/lightninglabs/loop/loopdb"
"github.com/lightninglabs/loop/swap"
"github.com/lightningnetwork/lnd/lntypes"
)
@ -149,7 +148,8 @@ func newLoopInSwap(globalCtx context.Context, cfg *swapConfig,
}
swapKit, err := newSwapKit(
swapHash, TypeIn, cfg, &contract.SwapContract, swap.HtlcNP2WSH,
swapHash, swap.TypeIn, cfg, &contract.SwapContract,
swap.HtlcNP2WSH,
)
if err != nil {
return nil, err
@ -182,7 +182,8 @@ func resumeLoopInSwap(reqContext context.Context, cfg *swapConfig,
logger.Infof("Resuming loop in swap %v", hash)
swapKit, err := newSwapKit(
hash, TypeIn, cfg, &pend.Contract.SwapContract, swap.HtlcNP2WSH,
hash, swap.TypeIn, cfg, &pend.Contract.SwapContract,
swap.HtlcNP2WSH,
)
if err != nil {
return nil, err