fix results API

onflow · Jul 11, 2024 · 5d1ae72 · 5d1ae72
1 parent 1d45907
commit 5d1ae72
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/storage/badger/results.go b/storage/badger/results.go
@@ -124,14 +124,9 @@ func (r *ExecutionResults) ByID(resultID flow.Identifier) (*flow.ExecutionResult
 	return r.byID(resultID)(tx)
 }
 
-func (r *ExecutionResults) ByIDTx(resultID flow.Identifier) func(interface{}) (*flow.ExecutionResult, error) {
-	return func(txinf interface{}) (*flow.ExecutionResult, error) {
-		tx, ok := txinf.(*transaction.Tx)
-		if !ok {
-			return nil, fmt.Errorf("could not cast to *transaction.Tx")
-		}
-		result, err := r.byID(resultID)(tx.DBTxn)
-		return result, err
+func (r *ExecutionResults) ByIDTx(resultID flow.Identifier) func(*transaction.Tx) (*flow.ExecutionResult, error) {
+	return func(tx *transaction.Tx) (*flow.ExecutionResult, error) {
+		return r.byID(resultID)(tx.DBTxn)
 	}
 }
 

diff --git a/storage/mock/execution_results.go b/storage/mock/execution_results.go
diff --git a/storage/pebble/results.go b/storage/pebble/results.go
@@ -9,6 +9,7 @@ import (
 	"github.com/onflow/flow-go/module"
 	"github.com/onflow/flow-go/module/metrics"
 	"github.com/onflow/flow-go/storage"
+	"github.com/onflow/flow-go/storage/badger/transaction"
 	"github.com/onflow/flow-go/storage/pebble/operation"
 )
 
@@ -92,7 +93,7 @@ func (r *ExecutionResults) ByID(resultID flow.Identifier) (*flow.ExecutionResult
 	return r.byID(resultID)(r.db)
 }
 
-func (r *ExecutionResults) ByIDTx(resultID flow.Identifier) func(interface{}) (*flow.ExecutionResult, error) {
+func (r *ExecutionResults) ByIDTx(resultID flow.Identifier) func(*transaction.Tx) (*flow.ExecutionResult, error) {
 	return nil
 }
 

diff --git a/storage/results.go b/storage/results.go
@@ -4,6 +4,7 @@ package storage
 
 import (
 	"github.com/onflow/flow-go/model/flow"
+	"github.com/onflow/flow-go/storage/badger/transaction"
 )
 
 type ExecutionResults interface {
@@ -18,7 +19,7 @@ type ExecutionResults interface {
 	ByID(resultID flow.Identifier) (*flow.ExecutionResult, error)
 
 	// ByIDTx retrieves an execution result by its ID in the context of the given transaction
-	ByIDTx(resultID flow.Identifier) func(interface{}) (*flow.ExecutionResult, error)
+	ByIDTx(resultID flow.Identifier) func(*transaction.Tx) (*flow.ExecutionResult, error)
 
 	// Index indexes an execution result by block ID.
 	Index(blockID flow.Identifier, resultID flow.Identifier) error