From 65051bd2499efc4ffdd63404b34b3e6b7dad9cc3 Mon Sep 17 00:00:00 2001
From: Zsolt Felfoldi <zsfelfoldi@gmail.com>
Date: Thu, 20 Mar 2025 08:23:47 +0100
Subject: [PATCH] cmd/workload: filtergen fails on history prune error

---
 cmd/workload/filtertest.go     | 9 +++++----
 cmd/workload/filtertestgen.go  | 8 ++------
 cmd/workload/filtertestperf.go | 7 +++++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cmd/workload/filtertest.go b/cmd/workload/filtertest.go
index 9db415e3cf..52dd6e41ad 100644
--- a/cmd/workload/filtertest.go
+++ b/cmd/workload/filtertest.go
@@ -214,8 +214,9 @@ func (fq *filterQuery) run(client *client, historyPruneBlock *uint64) {
 	})
 	fq.results = logs
 	fq.Err = validateHistoryPruneErr(err, uint64(fq.FromBlock), historyPruneBlock)
-	if fq.Err != nil && fq.Err != errPrunedHistory {
-		fmt.Printf("Filter query failed: fromBlock: %d toBlock: %d addresses: %v topics: %v error: %v\n",
-			fq.FromBlock, fq.ToBlock, fq.Address, fq.Topics, err)
-	}
+}
+
+func (fq *filterQuery) printError() {
+	fmt.Printf("Filter query failed: fromBlock: %d toBlock: %d addresses: %v topics: %v error: %v\n",
+		fq.FromBlock, fq.ToBlock, fq.Address, fq.Topics, fq.Err)
 }
diff --git a/cmd/workload/filtertestgen.go b/cmd/workload/filtertestgen.go
index a404626f6c..3345b5c769 100644
--- a/cmd/workload/filtertestgen.go
+++ b/cmd/workload/filtertestgen.go
@@ -71,10 +71,8 @@ func filterGenCmd(ctx *cli.Context) error {
 		f.updateFinalizedBlock()
 		query := f.newQuery()
 		query.run(f.client, nil)
-		if query.Err == errPrunedHistory {
-			continue
-		}
 		if query.Err != nil {
+			query.printError()
 			f.errors = append(f.errors, query)
 			continue
 		}
@@ -85,9 +83,6 @@ func filterGenCmd(ctx *cli.Context) error {
 					break
 				}
 				extQuery.run(f.client, nil)
-				if extQuery.Err == errPrunedHistory {
-					break
-				}
 				if extQuery.Err == nil && len(extQuery.results) < len(query.results) {
 					extQuery.Err = fmt.Errorf("invalid result length; old range %d %d; old length %d; new range %d %d; new length %d; address %v; Topics %v",
 						query.FromBlock, query.ToBlock, len(query.results),
@@ -96,6 +91,7 @@ func filterGenCmd(ctx *cli.Context) error {
 					)
 				}
 				if extQuery.Err != nil {
+					extQuery.printError()
 					f.errors = append(f.errors, extQuery)
 					break
 				}
diff --git a/cmd/workload/filtertestperf.go b/cmd/workload/filtertestperf.go
index cde78f6cf8..4a0fcee757 100644
--- a/cmd/workload/filtertestperf.go
+++ b/cmd/workload/filtertestperf.go
@@ -79,6 +79,7 @@ func filterPerfCmd(ctx *cli.Context) error {
 			slices.Sort(qt.runtime)
 			qt.medianTime = qt.runtime[len(qt.runtime)/2]
 			if qt.query.Err != nil {
+				qt.query.printError()
 				failed++
 				continue
 			}
@@ -119,8 +120,10 @@ func filterPerfCmd(ctx *cli.Context) error {
 	sort.Slice(queries, func(i, j int) bool {
 		return queries[i].medianTime > queries[j].medianTime
 	})
-	for i := 0; i < 10; i++ {
-		q := queries[i]
+	for i, q := range queries {
+		if i >= 10 {
+			break
+		}
 		fmt.Printf("Most expensive query #%-2d   median runtime: %13v  max runtime: %13v  result count: %4d  fromBlock: %9d  toBlock: %9d  addresses: %v  topics: %v\n",
 			i+1, q.medianTime, q.runtime[len(q.runtime)-1], len(q.query.results), q.query.FromBlock, q.query.ToBlock, q.query.Address, q.query.Topics)
 	}