unit: update swap tests for injected clocks

Author: hieblmi

cost_migration_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop/loopdb"
 	"github.com/lightninglabs/loop/test"
+	"github.com/lightningnetwork/lnd/clock"
 	"github.com/lightningnetwork/lnd/lntypes"
 	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/stretchr/testify/require"
@@ -25,6 +26,7 @@ func TestCalculateLoopOutCost(t *testing.T) {
 		lnd:    &lnd.LndServices,
 		store:  store,
 		server: server,
+		clock:  clock.NewTestClock(time.Now()),
 	}
 
 	height := int32(600)
@@ -118,6 +120,7 @@ func TestCostMigration(t *testing.T) {
 		lnd:    &lnd.LndServices,
 		store:  store,
 		server: server,
+		clock:  clock.NewTestClock(time.Now()),
 	}
 
 	height := int32(600)

loopin_test.go

@@ -4,13 +4,15 @@ import (
 	"context"
 	"fmt"
 	"testing"
+	"time"
 
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/lightninglabs/loop/loopdb"
 	"github.com/lightninglabs/loop/test"
 	"github.com/lightninglabs/loop/utils"
 	"github.com/lightningnetwork/lnd/chainntnfs"
+	"github.com/lightningnetwork/lnd/clock"
 	invpkg "github.com/lightningnetwork/lnd/invoices"
 	"github.com/lightningnetwork/lnd/routing/route"
 	"github.com/stretchr/testify/require"
@@ -47,7 +49,10 @@ func testLoopInSuccess(t *testing.T) {
 
 	height := int32(600)
 
-	cfg := newSwapConfig(&ctx.lnd.LndServices, ctx.store, ctx.server, nil)
+	cfg := newSwapConfig(
+		&ctx.lnd.LndServices, ctx.store, ctx.server, nil,
+		clock.NewTestClock(time.Now()),
+	)
 
 	expectedLastHop := &route.Vertex{0x02}
 
@@ -196,7 +201,10 @@ func testLoopInTimeout(t *testing.T, externalValue int64) {
 
 	height := int32(600)
 
-	cfg := newSwapConfig(&ctx.lnd.LndServices, ctx.store, ctx.server, nil)
+	cfg := newSwapConfig(
+		&ctx.lnd.LndServices, ctx.store, ctx.server, nil,
+		clock.NewTestClock(time.Now()),
+	)
 
 	req := testLoopInRequest
 	if externalValue != 0 {
@@ -407,7 +415,10 @@ func testLoopInResume(t *testing.T, state loopdb.SwapState, expired bool,
 	ctxb := context.Background()
 
 	ctx := newLoopInTestContext(t)
-	cfg := newSwapConfig(&ctx.lnd.LndServices, ctx.store, ctx.server, nil)
+	cfg := newSwapConfig(
+		&ctx.lnd.LndServices, ctx.store, ctx.server, nil,
+		clock.NewTestClock(time.Now()),
+	)
 
 	// Create sender and receiver keys.
 	_, senderPubKey := test.CreateKey(1)
@@ -762,7 +773,10 @@ func advanceToPublishedHtlc(t *testing.T, ctx *loopInTestContext) SwapInfo {
 func startNewLoopIn(t *testing.T, ctx *loopInTestContext, height int32) (
 	*swapConfig, *loopInSwap, error) {
 
-	cfg := newSwapConfig(&ctx.lnd.LndServices, ctx.store, ctx.server, nil)
+	cfg := newSwapConfig(
+		&ctx.lnd.LndServices, ctx.store, ctx.server, nil,
+		clock.NewTestClock(time.Now()),
+	)
 
 	req := &testLoopInRequest
 

loopout_test.go

@@ -18,6 +18,7 @@ import (
 	"github.com/lightninglabs/loop/sweep"
 	"github.com/lightninglabs/loop/sweepbatcher"
 	"github.com/lightninglabs/loop/test"
+	"github.com/lightningnetwork/lnd/clock"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lntypes"
 	"github.com/lightningnetwork/lnd/lnwallet/chainfee"
@@ -57,11 +58,13 @@ func testLoopOutPaymentParameters(t *testing.T) {
 	}
 
 	height := int32(600)
+	startTime := time.Unix(123, 0)
 
 	cfg := &swapConfig{
 		lnd:    &lnd.LndServices,
 		store:  store,
 		server: server,
+		clock:  clock.NewTestClock(startTime),
 	}
 
 	sweeper := &sweep.Sweeper{Lnd: &lnd.LndServices}
@@ -82,6 +85,7 @@ func testLoopOutPaymentParameters(t *testing.T) {
 	)
 	require.NoError(t, err)
 	swap := initResult.swap
+	require.Equal(t, startTime, swap.InitiationTime)
 
 	// Execute the swap in its own goroutine.
 	errChan := make(chan error)
@@ -193,7 +197,10 @@ func testLateHtlcPublish(t *testing.T) {
 
 	height := int32(600)
 
-	cfg := newSwapConfig(&lnd.LndServices, store, server, nil)
+	cfg := newSwapConfig(
+		&lnd.LndServices, store, server, nil,
+		clock.NewTestClock(time.Now()),
+	)
 
 	testRequest.Expiry = height + testLoopOutMinOnChainCltvDelta
 
@@ -296,6 +303,7 @@ func testCustomSweepConfTarget(t *testing.T) {
 
 	cfg := newSwapConfig(
 		&lnd.LndServices, loopdb.NewStoreMock(t), server, nil,
+		clock.NewTestClock(time.Now()),
 	)
 
 	initResult, err := newLoopOutSwap(
@@ -536,6 +544,7 @@ func testPreimagePush(t *testing.T) {
 
 	cfg := newSwapConfig(
 		&lnd.LndServices, loopdb.NewStoreMock(t), server, nil,
+		clock.NewTestClock(time.Now()),
 	)
 
 	initResult, err := newLoopOutSwap(
@@ -794,6 +803,7 @@ func testFailedOffChainCancelation(t *testing.T) {
 
 	cfg := newSwapConfig(
 		&lnd.LndServices, loopdb.NewStoreMock(t), server, nil,
+		clock.NewTestClock(time.Now()),
 	)
 
 	initResult, err := newLoopOutSwap(
@@ -948,6 +958,7 @@ func TestLoopOutMuSig2Sweep(t *testing.T) {
 
 	cfg := newSwapConfig(
 		&lnd.LndServices, loopdb.NewStoreMock(t), server, nil,
+		clock.NewTestClock(time.Now()),
 	)
 
 	initResult, err := newLoopOutSwap(