mutli: create execute config constructor

executor.go

@@ -110,13 +110,14 @@ func (s *executor) run(mainCtx context.Context,
 			go func() {
 				defer s.wg.Done()
 
-				newSwap.execute(mainCtx, &executeConfig{
+				cfg := newExecuteConfig(
-					statusChan:      statusChan,
+					s.sweeper, statusChan,
-					sweeper:         s.sweeper,
+					s.executorConfig.createExpiryTimer,
-					blockEpochChan:  queue.ChanOut(),
+					queue.ChanOut(),
-					timerFactory:    s.executorConfig.createExpiryTimer,
+					s.executorConfig.loopOutMaxParts,
-					loopOutMaxParts: s.executorConfig.loopOutMaxParts,
+				)
-				}, height)
+
+				newSwap.execute(mainCtx, cfg, height)
 
 				select {
 				case swapDoneChan <- swapID:

loopin_testcontext_test.go

@@ -34,12 +34,10 @@ func newLoopInTestContext(t *testing.T) *loopInTestContext {
 		return expiryChan
 	}
 
-	cfg := executeConfig{
+	cfg := newExecuteConfig(
-		statusChan:     statusChan,
+		&sweeper, statusChan, timerFactory, blockEpochChan,
-		sweeper:        &sweeper,
+		testLoopOutMaxParts,
-		blockEpochChan: blockEpochChan,
+	)
-		timerFactory:   timerFactory,
-	}
 
 	return &loopInTestContext{
 		t:              t,
@@ -47,7 +45,7 @@ func newLoopInTestContext(t *testing.T) *loopInTestContext {
 		server:         server,
 		store:          store,
 		sweeper:        &sweeper,
-		cfg:            &cfg,
+		cfg:            cfg,
 		statusChan:     statusChan,
 		blockEpochChan: blockEpochChan,
 	}

loopout.go

@@ -69,6 +69,21 @@ type executeConfig struct {
 	loopOutMaxParts uint32
 }
 
+// newExecuteConfig creates an execute config.
+func newExecuteConfig(sweeper *sweep.Sweeper, statusChan chan<- SwapInfo,
+	timerFactory func(d time.Duration) <-chan time.Time,
+	blockEpochChan <-chan interface{},
+	loopOutMaxParts uint32) *executeConfig {
+
+	return &executeConfig{
+		sweeper:         sweeper,
+		statusChan:      statusChan,
+		blockEpochChan:  blockEpochChan,
+		timerFactory:    timerFactory,
+		loopOutMaxParts: loopOutMaxParts,
+	}
+}
+
 // newLoopOutSwap initiates a new swap with the server and returns a
 // corresponding swap object.
 func newLoopOutSwap(globalCtx context.Context, cfg *swapConfig,

loopout_test.go

@@ -19,6 +19,8 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+var testLoopOutMaxParts uint32 = 5
+
 // TestLoopOutPaymentParameters tests the first part of the loop out process up
 // to the point where the off-chain payments are made.
 func TestLoopOutPaymentParameters(t *testing.T) {
@@ -48,8 +50,6 @@ func TestLoopOutPaymentParameters(t *testing.T) {
 	blockEpochChan := make(chan interface{})
 	statusChan := make(chan SwapInfo)
 
-	const maxParts = 5
-
 	// Initiate the swap.
 	req := *testRequest
 	req.OutgoingChanSet = loopdb.ChannelSet{2, 3}
@@ -66,13 +66,12 @@ func TestLoopOutPaymentParameters(t *testing.T) {
 	swapCtx, cancel := context.WithCancel(context.Background())
 
 	go func() {
-		err := swap.execute(swapCtx, &executeConfig{
+		cfg := newExecuteConfig(
-			statusChan:      statusChan,
+			sweeper, statusChan, timerFactory, blockEpochChan,
-			sweeper:         sweeper,
+			testLoopOutMaxParts,
-			blockEpochChan:  blockEpochChan,
+		)
-			timerFactory:    timerFactory,
+
-			loopOutMaxParts: maxParts,
+		err := swap.execute(swapCtx, cfg, height)
-		}, height)
 		if err != nil {
 			log.Error(err)
 		}
@@ -101,9 +100,9 @@ func TestLoopOutPaymentParameters(t *testing.T) {
 	}
 
 	// Assert that it is sent as a multi-part payment.
-	if swapPayment.MaxParts != maxParts {
+	if swapPayment.MaxParts != testLoopOutMaxParts {
 		t.Fatalf("Expected %v parts, but got %v",
-			maxParts, swapPayment.MaxParts)
+			testLoopOutMaxParts, swapPayment.MaxParts)
 	}
 
 	// Verify the outgoing channel set restriction.
@@ -164,12 +163,12 @@ func TestLateHtlcPublish(t *testing.T) {
 
 	errChan := make(chan error)
 	go func() {
-		err := swap.execute(context.Background(), &executeConfig{
+		cfg := newExecuteConfig(
-			statusChan:     statusChan,
+			sweeper, statusChan, timerFactory, blockEpochChan,
-			sweeper:        sweeper,
+			testLoopOutMaxParts,
-			blockEpochChan: blockEpochChan,
+		)
-			timerFactory:   timerFactory,
+
-		}, height)
+		err := swap.execute(context.Background(), cfg, height)
 		if err != nil {
 			log.Error(err)
 		}
@@ -255,12 +254,12 @@ func TestCustomSweepConfTarget(t *testing.T) {
 
 	errChan := make(chan error)
 	go func() {
-		err := swap.execute(context.Background(), &executeConfig{
+		cfg := newExecuteConfig(
-			statusChan:     statusChan,
+			sweeper, statusChan, timerFactory, blockEpochChan,
-			blockEpochChan: blockEpochChan,
+			testLoopOutMaxParts,
-			timerFactory:   timerFactory,
+		)
-			sweeper:        sweeper,
+
-		}, ctx.Lnd.Height)
+		err := swap.execute(context.Background(), cfg, ctx.Lnd.Height)
 		if err != nil {
 			log.Error(err)
 		}
@@ -458,12 +457,12 @@ func TestPreimagePush(t *testing.T) {
 
 	errChan := make(chan error)
 	go func() {
-		err := swap.execute(context.Background(), &executeConfig{
+		cfg := newExecuteConfig(
-			statusChan:     statusChan,
+			sweeper, statusChan, timerFactory, blockEpochChan,
-			blockEpochChan: blockEpochChan,
+			testLoopOutMaxParts,
-			timerFactory:   timerFactory,
+		)
-			sweeper:        sweeper,
+
-		}, ctx.Lnd.Height)
+		err := swap.execute(context.Background(), cfg, ctx.Lnd.Height)
 		if err != nil {
 			log.Error(err)
 		}