chore: addressing PR feedback

Author: chatton

block/internal/executing/block_producer.go

@@ -23,5 +23,5 @@ type BlockProducer interface {
 	ApplyBlock(ctx context.Context, header types.Header, data *types.Data) (types.State, error)
 
 	// ValidateBlock validates block structure and state transitions.
-	ValidateBlock(lastState types.State, header *types.SignedHeader, data *types.Data) error
+	ValidateBlock(ctx context.Context, lastState types.State, header *types.SignedHeader, data *types.Data) error
 }

block/internal/executing/executor.go

@@ -414,7 +414,7 @@ func (e *Executor) ProduceBlock(ctx context.Context) error {
 	}
 	header.Signature = signature
 
-	if err := e.blockProducer.ValidateBlock(currentState, header, data); err != nil {
+	if err := e.blockProducer.ValidateBlock(ctx, currentState, header, data); err != nil {
 		e.sendCriticalError(fmt.Errorf("failed to validate block: %w", err))
 		e.logger.Error().Err(err).Msg("CRITICAL: Permanent block validation error - halting block production")
 		return fmt.Errorf("failed to validate block: %w", err)
@@ -669,7 +669,7 @@ func (e *Executor) executeTxsWithRetry(ctx context.Context, rawTxs [][]byte, hea
 }
 
 // ValidateBlock validates the created block.
-func (e *Executor) ValidateBlock(lastState types.State, header *types.SignedHeader, data *types.Data) error {
+func (e *Executor) ValidateBlock(_ context.Context, lastState types.State, header *types.SignedHeader, data *types.Data) error {
 	// Set custom verifier for aggregator node signature
 	header.SetCustomVerifierForAggregator(e.options.AggregatorNodeSignatureBytesProvider)
 

block/internal/executing/tracing.go

@@ -104,15 +104,15 @@ func (t *tracedBlockProducer) ApplyBlock(ctx context.Context, header types.Heade
 	return state, nil
 }
 
-func (t *tracedBlockProducer) ValidateBlock(lastState types.State, header *types.SignedHeader, data *types.Data) error {
-	_, span := t.tracer.Start(context.Background(), "BlockExecutor.ValidateBlock",
+func (t *tracedBlockProducer) ValidateBlock(ctx context.Context, lastState types.State, header *types.SignedHeader, data *types.Data) error {
+	ctx, span := t.tracer.Start(ctx, "BlockExecutor.ValidateBlock",
 		trace.WithAttributes(
 			attribute.Int64("block.height", int64(header.Height())),
 		),
 	)
 	defer span.End()
 
-	err := t.inner.ValidateBlock(lastState, header, data)
+	err := t.inner.ValidateBlock(ctx, lastState, header, data)
 	if err != nil {
 		span.RecordError(err)
 		span.SetStatus(codes.Error, err.Error())

block/internal/executing/tracing_test.go

@@ -22,7 +22,7 @@ type mockBlockProducer struct {
 	retrieveBatchFn func(ctx context.Context) (*BatchData, error)
 	createBlockFn   func(ctx context.Context, height uint64, batchData *BatchData) (*types.SignedHeader, *types.Data, error)
 	applyBlockFn    func(ctx context.Context, header types.Header, data *types.Data) (types.State, error)
-	validateBlockFn func(lastState types.State, header *types.SignedHeader, data *types.Data) error
+	validateBlockFn func(ctx context.Context, lastState types.State, header *types.SignedHeader, data *types.Data) error
 }
 
 func (m *mockBlockProducer) ProduceBlock(ctx context.Context) error {
@@ -53,9 +53,9 @@ func (m *mockBlockProducer) ApplyBlock(ctx context.Context, header types.Header,
 	return types.State{}, nil
 }
 
-func (m *mockBlockProducer) ValidateBlock(lastState types.State, header *types.SignedHeader, data *types.Data) error {
+func (m *mockBlockProducer) ValidateBlock(ctx context.Context, lastState types.State, header *types.SignedHeader, data *types.Data) error {
 	if m.validateBlockFn != nil {
-		return m.validateBlockFn(lastState, header, data)
+		return m.validateBlockFn(ctx, lastState, header, data)
 	}
 	return nil
 }
@@ -266,11 +266,12 @@ func TestTracedBlockProducer_ApplyBlock_Error(t *testing.T) {
 
 func TestTracedBlockProducer_ValidateBlock_Success(t *testing.T) {
 	mock := &mockBlockProducer{
-		validateBlockFn: func(lastState types.State, header *types.SignedHeader, data *types.Data) error {
+		validateBlockFn: func(ctx context.Context, lastState types.State, header *types.SignedHeader, data *types.Data) error {
 			return nil
 		},
 	}
 	producer, sr := setupBlockProducerTrace(t, mock)
+	ctx := context.Background()
 
 	header := &types.SignedHeader{
 		Header: types.Header{
@@ -280,7 +281,7 @@ func TestTracedBlockProducer_ValidateBlock_Success(t *testing.T) {
 		},
 	}
 
-	err := producer.ValidateBlock(types.State{}, header, &types.Data{})
+	err := producer.ValidateBlock(ctx, types.State{}, header, &types.Data{})
 	require.NoError(t, err)
 
 	spans := sr.Ended()
@@ -295,11 +296,12 @@ func TestTracedBlockProducer_ValidateBlock_Success(t *testing.T) {
 
 func TestTracedBlockProducer_ValidateBlock_Error(t *testing.T) {
 	mock := &mockBlockProducer{
-		validateBlockFn: func(lastState types.State, header *types.SignedHeader, data *types.Data) error {
+		validateBlockFn: func(ctx context.Context, lastState types.State, header *types.SignedHeader, data *types.Data) error {
 			return errors.New("validation failed")
 		},
 	}
 	producer, sr := setupBlockProducerTrace(t, mock)
+	ctx := context.Background()
 
 	header := &types.SignedHeader{
 		Header: types.Header{
@@ -309,7 +311,7 @@ func TestTracedBlockProducer_ValidateBlock_Error(t *testing.T) {
 		},
 	}
 
-	err := producer.ValidateBlock(types.State{}, header, &types.Data{})
+	err := producer.ValidateBlock(ctx, types.State{}, header, &types.Data{})
 	require.Error(t, err)
 
 	spans := sr.Ended()