From a53cdc1d03f6bbad88872521d547605f3e08e56c Mon Sep 17 00:00:00 2001 From: rene <41963722+renaynay@users.noreply.github.com> Date: Mon, 5 Feb 2024 14:06:49 +0100 Subject: [PATCH] fix(pruner): Make pruner test slightly more deterministic --- pruner/finder.go | 2 -- pruner/service.go | 1 - pruner/service_test.go | 15 ++++++--------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pruner/finder.go b/pruner/finder.go index 77421dc4b4..0e3a7a151c 100644 --- a/pruner/finder.go +++ b/pruner/finder.go @@ -2,7 +2,6 @@ package pruner import ( "context" - "fmt" "time" "github.com/celestiaorg/celestia-node/header" @@ -32,7 +31,6 @@ func (s *Service) findPruneableHeaders(ctx context.Context) ([]*header.ExtendedH if err != nil { return nil, err } - fmt.Println("len(heaaders)", len(headers), "to: ", headers[len(headers)-1].Height()) // if our estimated range didn't cover enough headers, we need to fetch more // TODO: This is really inefficient in the case that lastPruned is the default value, or if the diff --git a/pruner/service.go b/pruner/service.go index d8fd1edd5b..fbd00e7e66 100644 --- a/pruner/service.go +++ b/pruner/service.go @@ -133,7 +133,6 @@ func (s *Service) prune( log.Errorw("failed to find prune-able blocks", "error", err) return lastPrunedHeader } - fmt.Println("len(headers): ", len(headers), " to: ", headers[len(headers)-1].Height()) failed := make(map[uint64]error) diff --git a/pruner/service_test.go b/pruner/service_test.go index bc05d27e6a..054cbeea3f 100644 --- a/pruner/service_test.go +++ b/pruner/service_test.go @@ -32,7 +32,7 @@ func TestService(t *testing.T) { ctx, cancel := context.WithCancel(context.Background()) t.Cleanup(cancel) - blockTime := time.Nanosecond * 50 + blockTime := time.Millisecond // all headers generated in suite are timestamped to time.Now(), so // they will all be considered "pruneable" within the availability window ( @@ -43,26 +43,23 @@ func TestService(t *testing.T) { serv := NewService( mp, - AvailabilityWindow(time.Millisecond), + AvailabilityWindow(time.Millisecond*2), store, sync.MutexWrap(datastore.NewMapDatastore()), blockTime, - WithGCCycle(time.Millisecond), ) serv.ctx, serv.cancel = ctx, cancel err := serv.loadCheckpoint(ctx) require.NoError(t, err) - /* - lastPruned := serv.lastPruned() - lastPruned = serv.prune(ctx, lastPruned) + time.Sleep(time.Millisecond * 2) - assert.Equal(t, uint64(5), lastPruned) - assert.Equal(t, uint64(5), serv.checkpoint.LastPrunedHeight) + lastPruned := serv.prune(ctx, serv.lastPruned()) - */ + assert.Greater(t, lastPruned.Height(), uint64(2)) + assert.Greater(t, serv.checkpoint.LastPrunedHeight, uint64(2)) } func TestService_RetryingFailed(t *testing.T) {