rename execmetapruner to execpruner

Author: pthmas

block/internal/submitting/submitter.go

@@ -385,8 +385,8 @@ func (s *Submitter) processDAInclusionLoop() {
 							s.logger.Error().Err(err).Uint64("target_height", targetHeight).Msg("failed to prune old block data")
 						}
 
-						if pruner, ok := s.exec.(coreexecutor.ExecMetaPruner); ok {
-							if err := pruner.PruneExecMeta(s.ctx, targetHeight); err != nil {
+						if pruner, ok := s.exec.(coreexecutor.ExecPruner); ok {
+							if err := pruner.PruneExec(s.ctx, targetHeight); err != nil {
 								s.logger.Error().Err(err).Uint64("target_height", targetHeight).Msg("failed to prune execution metadata")
 							}
 						}

core/execution/execution.go

@@ -162,15 +162,15 @@ type Rollbackable interface {
 	Rollback(ctx context.Context, targetHeight uint64) error
 }
 
-// ExecMetaPruner is an optional interface that execution clients can implement
+// ExecPruner is an optional interface that execution clients can implement
 // to support height-based pruning of their execution metadata. This is used by
 // EVM-based execution clients to keep ExecMeta consistent with ev-node's
 // pruning window while remaining a no-op for execution environments that
 // don't persist per-height metadata in ev-node's datastore.
-type ExecMetaPruner interface {
-	// PruneExecMeta should delete execution metadata for all heights up to and
+type ExecPruner interface {
+	// PruneExec should delete execution metadata for all heights up to and
 	// including the given height. Implementations should be idempotent and track
 	// their own progress so that repeated calls with the same or decreasing
 	// heights are cheap no-ops.
-	PruneExecMeta(ctx context.Context, height uint64) error
+	PruneExec(ctx context.Context, height uint64) error
 }

execution/evm/execution.go

@@ -69,7 +69,7 @@ var _ execution.Rollbackable = (*EngineClient)(nil)
 // ev-node's height-based pruning. This enables coordinated pruning of EVM
 // ExecMeta alongside ev-node's own block data pruning, while remaining a
 // no-op for non-EVM execution environments.
-var _ execution.ExecMetaPruner = (*EngineClient)(nil)
+var _ execution.ExecPruner = (*EngineClient)(nil)
 
 // validatePayloadStatus checks the payload status and returns appropriate errors.
 // It implements the Engine API specification's status handling:
@@ -271,11 +271,11 @@ func NewEngineExecutionClient(
 	}, nil
 }
 
-// PruneExecMeta implements execution.ExecMetaPruner by delegating to the
+// PruneExec implements execution.ExecPruner by delegating to the
 // underlying EVMStore. It is safe to call this multiple times with the same
 // or increasing heights; the store tracks its own last-pruned height.
-func (c *EngineClient) PruneExecMeta(ctx context.Context, height uint64) error {
-	return c.store.PruneExecMeta(ctx, height)
+func (c *EngineClient) PruneExec(ctx context.Context, height uint64) error {
+	return c.store.PruneExec(ctx, height)
 }
 
 // SetLogger allows callers to attach a structured logger.

execution/evm/go.sum

@@ -76,13 +76,6 @@ github.com/ethereum/go-ethereum v1.16.8 h1:LLLfkZWijhR5m6yrAXbdlTeXoqontH+Ga2f9i
 github.com/ethereum/go-ethereum v1.16.8/go.mod h1:Fs6QebQbavneQTYcA39PEKv2+zIjX7rPUZ14DER46wk=
 github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8=
 github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
-<<<<<<< HEAD
-github.com/evstack/ev-node v1.0.0-rc.2 h1:gUQzLTkCj6D751exm/FIR/yw2aXWiW2aEREEwtxMvw0=
-github.com/evstack/ev-node v1.0.0-rc.2/go.mod h1:Qa2nN1D6PJQRU2tiarv6X5Der5OZg/+2QGY/K2mA760=
-github.com/evstack/ev-node/core v1.0.0-rc.1 h1:Dic2PMUMAYUl5JW6DkDj6HXDEWYzorVJQuuUJOV0FjE=
-github.com/evstack/ev-node/core v1.0.0-rc.1/go.mod h1:n2w/LhYQTPsi48m6lMj16YiIqsaQw6gxwjyJvR+B3sY=
-=======
->>>>>>> faac1fd1 ( add replace statement for local packages)
 github.com/ferranbt/fastssz v0.1.4 h1:OCDB+dYDEQDvAgtAGnTSidK1Pe2tW3nFV40XyMkTeDY=
 github.com/ferranbt/fastssz v0.1.4/go.mod h1:Ea3+oeoRGGLGm5shYAeDgu6PGUlcvQhE2fILyD9+tGg=
 github.com/filecoin-project/go-clock v0.1.0 h1:SFbYIM75M8NnFm1yMHhN9Ahy3W5bEZV9gd6MPfXbKVU=

execution/evm/store.go

@@ -145,10 +145,10 @@ func (s *EVMStore) SaveExecMeta(ctx context.Context, meta *ExecMeta) error {
 	return nil
 }
 
-// PruneExecMeta removes ExecMeta entries up to and including the given height.
+// PruneExec removes ExecMeta entries up to and including the given height.
 // It is safe to call this multiple times with the same or increasing heights;
 // previously pruned ranges will be skipped based on the last-pruned marker.
-func (s *EVMStore) PruneExecMeta(ctx context.Context, height uint64) error {
+func (s *EVMStore) PruneExec(ctx context.Context, height uint64) error {
 	// Load last pruned height, if any.
 	var lastPruned uint64
 	data, err := s.db.Get(ctx, ds.NewKey(lastPrunedExecMetaKey))

execution/evm/store_test.go

@@ -17,7 +17,7 @@ func newTestDatastore(t *testing.T) ds.Batching {
 	return dssync.MutexWrap(ds.NewMapDatastore())
 }
 
-func TestPruneExecMeta_PrunesUpToTargetHeight(t *testing.T) {
+func TestPruneExec_PrunesUpToTargetHeight(t *testing.T) {
 	t.Parallel()
 
 	ctx := context.Background()
@@ -39,7 +39,7 @@ func TestPruneExecMeta_PrunesUpToTargetHeight(t *testing.T) {
 	}
 
 	// Prune up to height 3
-	require.NoError(t, store.PruneExecMeta(ctx, 3))
+	require.NoError(t, store.PruneExec(ctx, 3))
 
 	// Heights 1..3 should be gone
 	for h := uint64(1); h <= 3; h++ {
@@ -56,10 +56,10 @@ func TestPruneExecMeta_PrunesUpToTargetHeight(t *testing.T) {
 	}
 
 	// Re-pruning with the same height should be a no-op
-	require.NoError(t, store.PruneExecMeta(ctx, 3))
+	require.NoError(t, store.PruneExec(ctx, 3))
 }
 
-func TestPruneExecMeta_TracksLastPrunedHeight(t *testing.T) {
+func TestPruneExec_TracksLastPrunedHeight(t *testing.T) {
 	t.Parallel()
 
 	ctx := context.Background()
@@ -73,10 +73,10 @@ func TestPruneExecMeta_TracksLastPrunedHeight(t *testing.T) {
 	}
 
 	// First prune up to 2
-	require.NoError(t, store.PruneExecMeta(ctx, 2))
+	require.NoError(t, store.PruneExec(ctx, 2))
 
 	// Then prune up to 4; heights 3..4 should be deleted in this run
-	require.NoError(t, store.PruneExecMeta(ctx, 4))
+	require.NoError(t, store.PruneExec(ctx, 4))
 
 	// Verify all heights 1..4 are gone, 5 remains
 	for h := uint64(1); h <= 4; h++ {