diff --git a/activation/e2e/checkpoint_test.go b/activation/e2e/checkpoint_test.go index 4e825d944c..0120189fe4 100644 --- a/activation/e2e/checkpoint_test.go +++ b/activation/e2e/checkpoint_test.go @@ -188,7 +188,7 @@ func TestCheckpoint_PublishingSoloATXs(t *testing.T) { // 3. Spawn new ATX handler and builder using the new DB poetDb = activation.NewPoetDb(newDB, logger.Named("poetDb")) cdb = datastore.NewCachedDB(newDB, logger) - atxdata, err = atxsdata.Warm(newDB, 1) + atxdata, err = atxsdata.Warm(newDB, 1, logger) poetService = activation.NewPoetServiceWithClient(poetDb, client, poetCfg, logger) validator = activation.NewValidator(newDB, poetDb, cfg, opts.Scrypt, verifier) require.NoError(t, err) diff --git a/atxsdata/warmup.go b/atxsdata/warmup.go index 73e99f4477..6f4d5e5abc 100644 --- a/atxsdata/warmup.go +++ b/atxsdata/warmup.go @@ -5,12 +5,13 @@ import ( "fmt" "time" + "go.uber.org/zap" + "github.com/spacemeshos/go-spacemesh/common/types" "github.com/spacemeshos/go-spacemesh/sql" "github.com/spacemeshos/go-spacemesh/sql/atxs" "github.com/spacemeshos/go-spacemesh/sql/identities" "github.com/spacemeshos/go-spacemesh/sql/layers" - "go.uber.org/zap" ) func Warm(db *sql.Database, keep types.EpochID, logger *zap.Logger) (*Data, error) { @@ -42,7 +43,10 @@ func Warmup(db sql.Executor, cache *Data, keep types.EpochID, logger *zap.Logger cache.EvictEpoch(evict) from := cache.Evicted() - logger.Info("Reading ATXs from DB", zap.Uint32("from epoch", from.Uint32()), zap.Uint32("to epoch", latest.Uint32())) + logger.Info("Reading ATXs from DB", + zap.Uint32("from epoch", from.Uint32()), + zap.Uint32("to epoch", latest.Uint32()), + ) start := time.Now() var processed int err = atxs.IterateAtxsData(db, cache.Evicted(), latest, diff --git a/atxsdata/warmup_test.go b/atxsdata/warmup_test.go index 8d0a1104b8..c2051fa1c7 100644 --- a/atxsdata/warmup_test.go +++ b/atxsdata/warmup_test.go @@ -54,21 +54,21 @@ func TestWarmup(t *testing.T) { } require.NoError(t, layers.SetApplied(db, applied, types.BlockID{1})) - c, err := Warm(db, 1) + c, err := Warm(db, 1, zaptest.NewLogger(t)) require.NoError(t, err) for _, atx := range data[2:] { require.NotNil(t, c.Get(atx.TargetEpoch(), atx.ID())) } }) t.Run("no data", func(t *testing.T) { - c, err := Warm(sql.InMemory(), 1) + c, err := Warm(sql.InMemory(), 1, zaptest.NewLogger(t)) require.NoError(t, err) require.NotNil(t, c) }) t.Run("closed db", func(t *testing.T) { db := sql.InMemory() require.NoError(t, db.Close()) - c, err := Warm(db, 1) + c, err := Warm(db, 1, zaptest.NewLogger(t)) require.Error(t, err) require.Nil(t, c) }) diff --git a/tortoise/replay/replay_test.go b/tortoise/replay/replay_test.go index 77e71079ee..04a5bd7e28 100644 --- a/tortoise/replay/replay_test.go +++ b/tortoise/replay/replay_test.go @@ -57,7 +57,7 @@ func TestReplayMainnet(t *testing.T) { require.NoError(t, err) start := time.Now() - atxsdata, err := atxsdata.Warm(db, cfg.Tortoise.WindowSizeEpochs(applied)) + atxsdata, err := atxsdata.Warm(db, cfg.Tortoise.WindowSizeEpochs(applied), logger) require.NoError(t, err) trtl, err := tortoise.Recover( context.Background(),