cleanup TxExecutor api

yihuang · Mar 8, 2024 · f7440a5 · f7440a5
1 parent f86daa0
commit f7440a5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/baseapp/abci.go b/baseapp/abci.go
@@ -818,7 +818,9 @@ func (app *BaseApp) internalFinalizeBlock(ctx context.Context, req *abci.Request
 
 func (app *BaseApp) executeTxs(ctx context.Context, txs [][]byte) ([]*abci.ExecTxResult, error) {
 	if app.txExecutor != nil {
-		return app.txExecutor(ctx, txs, app.finalizeBlockState.ms, app.deliverTxWithMultiStore)
+		return app.txExecutor(ctx, len(txs), app.finalizeBlockState.ms, func(i int, ms storetypes.MultiStore) *abci.ExecTxResult {
+			return app.deliverTxWithMultiStore(txs[i], i, ms)
+		})
 	}
 
 	txResults := make([]*abci.ExecTxResult, 0, len(txs))

diff --git a/baseapp/txexecutor.go b/baseapp/txexecutor.go
@@ -9,7 +9,7 @@ import (
 
 type TxExecutor func(
 	ctx context.Context,
-	txs [][]byte,
+	blockSize int,
 	cms storetypes.MultiStore,
-	deliverTxWithMultiStore func([]byte, int, storetypes.MultiStore) *abci.ExecTxResult,
+	deliverTxWithMultiStore func(int, storetypes.MultiStore) *abci.ExecTxResult,
 ) ([]*abci.ExecTxResult, error)