fixing tests

lucca30 · lucca30 · commit 17ecc6dc1c92 · 2025-11-10T08:49:16.000-03:00
diff --git a/abci/example/kvstore/kvstore.go b/abci/example/kvstore/kvstore.go
@@ -54,6 +54,8 @@ type Application struct {
 
 	// Generate blobs
 	generateBlobs bool
+
+	Test bool // is test application
 }
 
 // NewApplication creates an instance of the kvstore from the provided database
diff --git a/internal/db/db_utils.go b/internal/db/db_utils.go
@@ -1,10 +1,12 @@
 package db
 
 import (
+	"bytes"
 	"encoding/binary"
 	"encoding/hex"
 	"fmt"
 	"log"
+	"strconv"
 	"time"
 	"unicode/utf8"
 
@@ -236,3 +238,58 @@ func isASCIIPrintable(b []byte) bool {
 	}
 	return true
 }
+
+// findSmallestValueWithBrokenKeys attempts to find the smallest numeric value
+// among keys that share a given prefix.
+//
+// Note: The key format is **not properly designed** — numeric values are
+// concatenated as plain strings (e.g. "SC:2", "SC:10"), which causes lexicographic
+// rather than numeric ordering. This function compensates for that by iterating
+// through possible first digits and parsing keys manually.
+//
+// Example key set: "SC:2", "SC:10", "SC:3" → returns 2
+//
+// This is a workaround and should be replaced when the key schema is improved.
+func FindSmallestValueWithBrokenKeys(db dbm.DB, prefix []byte) (int, error) {
+	var smallest *int
+
+	// We assume numeric suffixes can start with digits 0–9
+	for d := byte('0'); d <= byte('9'); d++ {
+		start := append(append([]byte{}, prefix...), d)
+		it, err := db.Iterator(start, nil)
+		if err != nil {
+			return 0, fmt.Errorf("failed to iterate prefix %q: %w", start, err)
+		}
+
+		for ; it.Valid(); it.Next() {
+			key := it.Key()
+			if !bytes.HasPrefix(key, prefix) {
+				break // passed beyond the prefix
+			}
+
+			// Extract numeric part after prefix
+			suffix := bytes.TrimPrefix(key, prefix)
+			if len(suffix) == 0 {
+				continue
+			}
+
+			n, err := strconv.Atoi(string(suffix))
+			if err != nil {
+				// Skip non-numeric keys gracefully
+				continue
+			}
+
+			if smallest == nil || n < *smallest {
+				smallest = &n
+			}
+		}
+
+		it.Close()
+	}
+
+	if smallest == nil {
+		return 0, fmt.Errorf("no valid numeric keys found for prefix %q", prefix)
+	}
+
+	return *smallest, nil
+}
diff --git a/light/example_test.go b/light/example_test.go
@@ -151,7 +151,7 @@ func ExampleClient_VerifyLightBlockAtHeight() {
 func TestMain(m *testing.M) {
 	// start a CometBFT node (and kvstore) in the background to test against
 	app := kvstore.NewInMemoryApplication()
-	node := rpctest.StartTendermint(app, rpctest.SuppressStdout)
+	node := rpctest.StartTendermint(app, true, rpctest.SuppressStdout)
 
 	code := m.Run()
 
diff --git a/light/provider/http/http_test.go b/light/provider/http/http_test.go
@@ -36,7 +36,8 @@ func TestNewProvider(t *testing.T) {
 func TestProvider(t *testing.T) {
 	app := kvstore.NewInMemoryApplication()
 	app.RetainBlocks = 10
-	node := rpctest.StartTendermint(app)
+	app.Test = true
+	node := rpctest.StartTendermint(app, true)
 
 	cfg := rpctest.GetConfig()
 	defer os.RemoveAll(cfg.RootDir)
diff --git a/node/node.go b/node/node.go
@@ -276,11 +276,12 @@ func NewNode(config *cfg.Config,
 	dbProvider cfg.DBProvider,
 	metricsProvider MetricsProvider,
 	logger log.Logger,
+	isTest bool,
 	options ...Option,
 ) (*Node, error) {
 	return NewNodeWithContext(context.TODO(), config, privValidator,
 		nodeKey, clientCreator, genesisDocProvider, dbProvider,
-		metricsProvider, logger, options...)
+		metricsProvider, logger, isTest, options...)
 }
 
 // NewNodeWithContext is cancellable version of NewNode.
@@ -293,6 +294,7 @@ func NewNodeWithContext(ctx context.Context,
 	dbProvider cfg.DBProvider,
 	metricsProvider MetricsProvider,
 	logger log.Logger,
+	isTest bool,
 	options ...Option,
 ) (*Node, error) {
 	blockStore, stateDB, err := initDBs(config, dbProvider)
@@ -393,6 +395,7 @@ func NewNodeWithContext(ctx context.Context,
 		blockStore,
 		smMetrics,
 		logger.With("module", "state"),
+		isTest,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create pruner: %w", err)
@@ -1006,6 +1009,7 @@ func createPruner(
 	blockStore *store.BlockStore,
 	metrics *sm.Metrics,
 	logger log.Logger,
+	isTest bool,
 ) (*sm.Pruner, error) {
 	if err := initApplicationRetainHeight(stateStore); err != nil {
 		return nil, err
@@ -1037,6 +1041,10 @@ func createPruner(
 		err = initIndexerRetentionHeights(pruner)
 	}
 
+	if isTest {
+		pruner.DisableWaitAtStart()
+	}
+
 	return pruner, err
 }
 
diff --git a/node/setup.go b/node/setup.go
@@ -75,6 +75,7 @@ func DefaultNewNode(config *cfg.Config, logger log.Logger) (*Node, error) {
 		cfg.DefaultDBProvider,
 		DefaultMetricsProvider(config.Instrumentation),
 		logger,
+		false,
 	)
 }
 
diff --git a/rpc/client/examples_test.go b/rpc/client/examples_test.go
@@ -17,7 +17,7 @@ import (
 func ExampleHTTP_simple() {
 	// Start a CometBFT node (and kvstore) in the background to test against
 	app := kvstore.NewInMemoryApplication()
-	node := rpctest.StartTendermint(app, rpctest.SuppressStdout, rpctest.RecreateConfig)
+	node := rpctest.StartTendermint(app, true, rpctest.SuppressStdout, rpctest.RecreateConfig)
 	defer rpctest.StopTendermint(node)
 
 	// Create our RPC client
@@ -70,7 +70,7 @@ func ExampleHTTP_simple() {
 func ExampleHTTP_batching() {
 	// Start a CometBFT node (and kvstore) in the background to test against
 	app := kvstore.NewInMemoryApplication()
-	node := rpctest.StartTendermint(app, rpctest.SuppressStdout, rpctest.RecreateConfig)
+	node := rpctest.StartTendermint(app, true, rpctest.SuppressStdout, rpctest.RecreateConfig)
 
 	// Create our RPC client
 	rpcAddr := rpctest.GetConfig().RPC.ListenAddress
@@ -142,7 +142,7 @@ func ExampleHTTP_batching() {
 func ExampleHTTP_maxBatchSize() {
 	// Start a CometBFT node (and kvstore) in the background to test against
 	app := kvstore.NewInMemoryApplication()
-	node := rpctest.StartTendermint(app, rpctest.RecreateConfig, rpctest.SuppressStdout, rpctest.MaxReqBatchSize)
+	node := rpctest.StartTendermint(app, true, rpctest.RecreateConfig, rpctest.SuppressStdout, rpctest.MaxReqBatchSize)
 
 	// Change the max_request_batch_size
 	node.Config().RPC.MaxRequestBatchSize = 2
diff --git a/rpc/client/main_test.go b/rpc/client/main_test.go
@@ -21,7 +21,7 @@ func TestMain(m *testing.M) {
 	app := kvstore.NewPersistentApplication(dir)
 	// If testing block event generation
 	// app.SetGenBlockEvents() // needs to be called here (see TestBlockSearch in rpc_test.go)
-	node = rpctest.StartTendermint(app)
+	node = rpctest.StartTendermint(app, true)
 
 	code := m.Run()
 
diff --git a/rpc/grpc/grpc_test.go b/rpc/grpc/grpc_test.go
@@ -15,7 +15,7 @@ import (
 func TestMain(m *testing.M) {
 	// start a CometBFT node in the background to test against
 	app := kvstore.NewInMemoryApplication()
-	node := rpctest.StartTendermint(app)
+	node := rpctest.StartTendermint(app, true)
 
 	code := m.Run()
 
diff --git a/rpc/test/helpers.go b/rpc/test/helpers.go
@@ -125,12 +125,12 @@ func GetGRPCClient() core_grpc.BroadcastAPIClient {
 }
 
 // StartTendermint starts a test CometBFT server in a go routine and returns when it is initialized
-func StartTendermint(app abci.Application, opts ...func(*Options)) *nm.Node {
+func StartTendermint(app abci.Application, isTest bool, opts ...func(*Options)) *nm.Node {
 	nodeOpts := defaultOptions
 	for _, opt := range opts {
 		opt(&nodeOpts)
 	}
-	node := NewTendermint(app, &nodeOpts)
+	node := NewTendermint(app, isTest, &nodeOpts)
 	err := node.Start()
 	if err != nil {
 		panic(err)
@@ -158,7 +158,7 @@ func StopTendermint(node *nm.Node) {
 }
 
 // NewTendermint creates a new CometBFT server and sleeps forever
-func NewTendermint(app abci.Application, opts *Options) *nm.Node {
+func NewTendermint(app abci.Application, isTest bool, opts *Options) *nm.Node {
 	// Create & start node
 	config := GetConfig(opts.recreateConfig)
 	var logger log.Logger
@@ -183,7 +183,7 @@ func NewTendermint(app abci.Application, opts *Options) *nm.Node {
 		nm.DefaultGenesisDocProviderFunc(config),
 		cfg.DefaultDBProvider,
 		nm.DefaultMetricsProvider(config.Instrumentation),
-		logger)
+		logger, isTest)
 	if err != nil {
 		panic(err)
 	}
diff --git a/state/pruner.go b/state/pruner.go
@@ -48,6 +48,10 @@ type Pruner struct {
 	// Deprecated: This field is unused and will be removed in a future release.
 	prunedStates          uint64 //nolint:unused,SA4006 // Deprecated
 	indexerPruningEnabled bool
+
+	// By default we wait before start so the first routine dont receives 0 when it shouldnt
+	// Disable this only for test purposes
+	disableWaitAtStart bool
 }
 
 type prunerConfig struct {
@@ -330,7 +334,9 @@ func (p *Pruner) GetBlockIndexerRetainHeight() (int64, error) {
 }
 
 func (p *Pruner) pruneABCIResponses() {
-	time.Sleep(WaitTimeBeforeInitiatePruning) // Waits before start so retainHeight is not 0
+	if !p.disableWaitAtStart {
+		time.Sleep(WaitTimeBeforeInitiatePruning) // Waits before start so retainHeight is not 0
+	}
 
 	p.logger.Info("Started pruning ABCI responses", "interval", p.interval.String())
 	lastRetainHeight := int64(0)
@@ -353,7 +359,9 @@ func (p *Pruner) pruneABCIResponses() {
 }
 
 func (p *Pruner) pruneBlocks() {
-	time.Sleep(WaitTimeBeforeInitiatePruning) // Waits before start so retainHeight is not 0
+	if !p.disableWaitAtStart {
+		time.Sleep(WaitTimeBeforeInitiatePruning) // Waits before start so retainHeight is not 0
+	}
 
 	p.logger.Info("Started pruning blocks", "interval", p.interval.String())
 	lastRetainHeight := int64(0)
@@ -376,8 +384,9 @@ func (p *Pruner) pruneBlocks() {
 }
 
 func (p *Pruner) pruneIndexesRoutine() {
-	time.Sleep(WaitTimeBeforeInitiatePruning) // Waits before start so retainHeight is not 0
-
+	if !p.disableWaitAtStart {
+		time.Sleep(WaitTimeBeforeInitiatePruning) // Waits before start so retainHeight is not 0
+	}
 	p.logger.Info("Index pruner started", "interval", p.interval.String())
 	lastTxIndexerRetainHeight := int64(0)
 	lastBlockIndexerRetainHeight := int64(0)
@@ -565,3 +574,7 @@ func (p *Pruner) pruneBlocksToHeight(height int64) (uint64, int64, error) {
 	}
 	return pruned, evRetainHeight, err
 }
+
+func (p *Pruner) DisableWaitAtStart() {
+	p.disableWaitAtStart = true
+}
diff --git a/state/pruner_test.go b/state/pruner_test.go
@@ -177,6 +177,7 @@ func createTestSetup(t *testing.T) (*sm.Pruner, *kv.TxIndex, blockidxkv.BlockerI
 	// tx indexer
 	memDB := db.NewMemDB()
 	txIndexer := kv.NewTxIndex(memDB)
+	txIndexer.SetLogger(log.TestingLogger().With("module", "txindex"))
 	blockIndexer := blockidxkv.New(db.NewPrefixDB(memDB, []byte("block_events")))
 
 	blockDB := db.NewMemDB()
diff --git a/state/store.go b/state/store.go
@@ -493,24 +493,21 @@ func (store dbStore) PruneABCIResponses(targetRetainHeight int64, forceCompact b
 	if lastRetainHeight == 0 {
 		lastRetainHeight = 1
 	}
-	it, err := store.db.Iterator(calcABCIResponsesKey(lastRetainHeight), nil)
+
+	smallestFound, err := db.FindSmallestValueWithBrokenKeys(store.db, []byte("abciResponsesKey:"))
 	if err != nil {
-		return 0, lastRetainHeight, fmt.Errorf("failed to find first available key to delete")
-	}
-	if it.Valid() {
-		if ok, firstHeightToDelete := parseABCIResponsesKey(it.Key()); ok {
-			lastRetainHeight = firstHeightToDelete
-		}
+		return 0, lastRetainHeight, err
 	}
-	it.Close()
+
+	lastRetainHeight = int64(smallestFound)
 
 	batch := store.db.NewBatch()
 	defer batch.Close()
 
 	pruned := int64(0)
 	batchPruned := int64(0)
 
-	endHeight := targetRetainHeight - 1
+	endHeight := targetRetainHeight
 
 	for h := lastRetainHeight; h < targetRetainHeight; h++ {
 		if err := batch.Delete(calcABCIResponsesKey(h)); err != nil {
@@ -555,7 +552,7 @@ func (store dbStore) PruneABCIResponses(targetRetainHeight int64, forceCompact b
 		store.StoreStateKeeper.ResultsToCompact += uint64(pruned + batchPruned)
 		//nolint:staticcheck
 		if store.StoreStateKeeper.ResultsToCompact >= (uint64)(store.StoreOptions.CompactionInterval) {
-			_ = db.CompactIntSharded(store.db, initialHeight, endHeight+1, db.MaxCompactionInterval, calcABCIResponsesKey, "pruneAbciResponses")
+			_ = db.CompactIntSharded(store.db, initialHeight, endHeight, db.MaxCompactionInterval, calcABCIResponsesKey, "pruneAbciResponses")
 			store.StoreStateKeeper.ResultsToCompact = 0
 		}
 	}
diff --git a/store/store_test.go b/store/store_test.go
@@ -618,6 +618,7 @@ func TestPruningService(t *testing.T) {
 		sm.WithPrunerObserver(obs),
 		sm.WithPrunerCompanionEnabled(),
 	)
+	pruner.DisableWaitAtStart()
 
 	err = pruner.SetApplicationBlockRetainHeight(1)
 	require.Error(t, err)

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,8 @@ type Application struct {`
`54`	`54`
`55`	`55`	`// Generate blobs`
`56`	`56`	`generateBlobs bool`
	`57`	`+`
	`58`	`+ Test bool // is test application`
`57`	`59`	`}`
`58`	`60`
`59`	`61`	`// NewApplication creates an instance of the kvstore from the provided database`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ func DefaultNewNode(config cfg.Config, logger log.Logger) (Node, error) {`
`75`	`75`	`cfg.DefaultDBProvider,`
`76`	`76`	`DefaultMetricsProvider(config.Instrumentation),`
`77`	`77`	`logger,`
	`78`	`+ false,`
`78`	`79`	`)`
`79`	`80`	`}`
`80`	`81`