Cleanup

systest/testcontext/context.go

@@ -49,7 +49,7 @@ var (
 		1,
 		"controls tests parallelization by creating multiple spacemesh clusters at the same time",
 	)
-	logLevel    = zap.LevelFlag("level", zap.DebugLevel, "verbosity of the logger")
+	logLevel    = zap.LevelFlag("level", zap.InfoLevel, "verbosity of the logger")
 	testTimeout = flag.Duration("test-timeout", 60*time.Minute, "timeout for a single test")
 
 	tokens     chan struct{}

systest/tests/checkpoint_test.go

@@ -71,8 +71,7 @@ func TestCheckpoint(t *testing.T) {
 	deadline := cl.Genesis().Add(time.Duration(stop+1) * layerDuration)
 	ctx, cancel := context.WithDeadline(tctx, deadline)
 	defer cancel()
-
-	require.NoError(t, sendTransactions(ctx, tctx.Log.Desugar(), cl, first, stop, layerDuration, receiver, 1, 100))
+	require.NoError(t, sendTransactions(ctx, tctx.Log.Desugar(), cl, first, stop, receiver, 1, 100))
 	require.NoError(t, waitLayer(tctx, cl.Client(0), snapshotLayer))
 
 	tctx.Log.Debugw("getting account balances")
@@ -102,7 +101,8 @@ func TestCheckpoint(t *testing.T) {
 			diffs = append(diffs, cl.Client(i).Name)
 			tctx.Log.Errorw("diff checkpoint data",
 				fmt.Sprintf("reference %v", cl.Client(0).Name), string(checkpoints[0]),
-				fmt.Sprintf("client %v", cl.Client(i).Name), string(checkpoints[i]))
+				fmt.Sprintf("client %v", cl.Client(i).Name), string(checkpoints[i]),
+			)
 		}
 	}
 	require.Empty(t, diffs)

systest/tests/common.go

@@ -35,7 +35,6 @@ func sendTransactions(
 	logger *zap.Logger,
 	cl *cluster.Cluster,
 	first, stop uint32,
-	layerDuration time.Duration,
 	receiver types.Address,
 	batch, amount int,
 ) error {

systest/tests/partition_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"testing"
+	"time"
 
 	pb "github.com/spacemeshos/api/release/go/spacemesh/v1"
 	"github.com/stretchr/testify/require"
@@ -60,12 +61,15 @@ func testPartition(tb testing.TB, tctx *testcontext.Context, cl *cluster.Cluster
 
 	// start sending transactions
 	tctx.Log.Debug("sending transactions...")
-	eg2, ctx2 := errgroup.WithContext(tctx)
 	receiver := types.GenerateAddress([]byte{11, 1, 1})
 
 	layerDuration := testcontext.LayerDuration.Get(tctx.Parameters)
+	deadline := cl.Genesis().Add(time.Duration(stop) * layerDuration)
+	ctx2, cancel := context.WithDeadline(tctx, deadline)
+	eg2, ctx2 := errgroup.WithContext(ctx2)
+	defer cancel()
 	eg2.Go(func() error {
-		return sendTransactions(ctx2, tctx.Log.Desugar(), cl, first, stop, layerDuration, receiver, 10, 100)
+		return sendTransactions(ctx2, tctx.Log.Desugar(), cl, first, stop, receiver, 10, 100)
 	})
 
 	type stateUpdate struct {

systest/tests/transactions_test.go

@@ -1,8 +1,10 @@
 package tests
 
 import (
+	"context"
 	"encoding/hex"
 	"testing"
+	"time"
 
 	pb "github.com/spacemeshos/api/release/go/spacemesh/v1"
 	"github.com/stretchr/testify/require"
@@ -44,16 +46,19 @@ func testTransactions(
 	require.NoError(tb, err)
 	before := response.AccountWrapper.StateCurrent.Balance
 
-	eg, ctx := errgroup.WithContext(tctx)
 	layerDuration := testcontext.LayerDuration.Get(tctx.Parameters)
+	deadline := cl.Genesis().Add(time.Duration(stop) * layerDuration)
+	ctx, cancel := context.WithDeadline(tctx, deadline)
+	defer cancel()
+	eg, ctx := errgroup.WithContext(ctx)
 	eg.Go(func() error {
-		return sendTransactions(ctx, tctx.Log.Desugar(), cl, first, stop, layerDuration, receiver, batch, amount)
+		return sendTransactions(ctx, tctx.Log.Desugar(), cl, first, stop, receiver, batch, amount)
 	})
 	txs := make([][]*pb.Transaction, cl.Total())
 
 	for i := range cl.Total() {
 		client := cl.Client(i)
-		watchTransactionResults(tctx.Context, eg, client, tctx.Log.Desugar(),
+		watchTransactionResults(tctx, eg, client, tctx.Log.Desugar(),
 			func(rst *pb.TransactionResult) (bool, error) {
 				txs[i] = append(txs[i], rst.Tx)
 				count := len(txs[i])