renaming as per feedback (2)

Author: julienrbrt

block/components.go

@@ -22,8 +22,8 @@ import (
 	"github.com/evstack/ev-node/types"
 )
 
-// BlockComponents represents the block-related components
-type BlockComponents struct {
+// Components represents the block-related components
+type Components struct {
 	Executor  *executing.Executor
 	Syncer    *syncing.Syncer
 	Submitter *submitting.Submitter
@@ -34,7 +34,7 @@ type BlockComponents struct {
 }
 
 // GetLastState returns the current blockchain state
-func (bc *BlockComponents) GetLastState() types.State {
+func (bc *Components) GetLastState() types.State {
 	if bc.Executor != nil {
 		return bc.Executor.GetLastState()
 	}
@@ -45,7 +45,7 @@ func (bc *BlockComponents) GetLastState() types.State {
 }
 
 // Start starts all components and monitors for critical errors
-func (bc *BlockComponents) Start(ctx context.Context) error {
+func (bc *Components) Start(ctx context.Context) error {
 	ctxWithCancel, cancel := context.WithCancel(ctx)
 
 	// error monitoring goroutine
@@ -89,7 +89,7 @@ func (bc *BlockComponents) Start(ctx context.Context) error {
 }
 
 // Stop stops all components
-func (bc *BlockComponents) Stop() error {
+func (bc *Components) Stop() error {
 	var errs error
 	if bc.Executor != nil {
 		if err := bc.Executor.Stop(); err != nil {
@@ -129,7 +129,7 @@ func NewSyncComponents(
 	logger zerolog.Logger,
 	metrics *Metrics,
 	blockOpts BlockOptions,
-) (*BlockComponents, error) {
+) (*Components, error) {
 	cacheManager, err := cache.NewManager(config, store, logger)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create cache manager: %w", err)
@@ -168,7 +168,7 @@ func NewSyncComponents(
 		errorCh,
 	)
 
-	return &BlockComponents{
+	return &Components{
 		Syncer:    syncer,
 		Submitter: submitter,
 		Cache:     cacheManager,
@@ -192,7 +192,7 @@ func NewAggregatorComponents(
 	logger zerolog.Logger,
 	metrics *Metrics,
 	blockOpts BlockOptions,
-) (*BlockComponents, error) {
+) (*Components, error) {
 	cacheManager, err := cache.NewManager(config, store, logger)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create cache manager: %w", err)
@@ -235,7 +235,7 @@ func NewAggregatorComponents(
 		errorCh,
 	)
 
-	return &BlockComponents{
+	return &Components{
 		Executor:  executor,
 		Submitter: submitter,
 		Cache:     cacheManager,

block/components_test.go

@@ -32,7 +32,7 @@ func TestBlockComponents_ExecutionClientFailure_StopsNode(t *testing.T) {
 	criticalError := errors.New("execution client connection lost")
 
 	// Create BlockComponents with error channel
-	bc := &BlockComponents{
+	bc := &Components{
 		errorCh: errorCh,
 	}
 
@@ -57,7 +57,7 @@ func TestBlockComponents_GetLastState(t *testing.T) {
 
 	t.Run("Empty state", func(t *testing.T) {
 		// When neither is present, return empty state
-		bc := &BlockComponents{}
+		bc := &Components{}
 
 		result := bc.GetLastState()
 		assert.Equal(t, uint64(0), result.LastBlockHeight)
@@ -66,7 +66,7 @@ func TestBlockComponents_GetLastState(t *testing.T) {
 
 func TestBlockComponents_StartStop_Lifecycle(t *testing.T) {
 	// Simple lifecycle test without creating full components
-	bc := &BlockComponents{
+	bc := &Components{
 		errorCh: make(chan error, 1),
 	}
 

block/internal/executing/executor.go

@@ -361,7 +361,7 @@ func (e *Executor) produceBlock() error {
 
 	e.logger.Debug().Uint64("height", newHeight).Msg("producing block")
 
-	// Check pending limits
+	// check pending limits
 	if e.config.Node.MaxPendingHeadersAndData > 0 {
 		pendingHeaders := e.cache.NumPendingHeaders()
 		pendingData := e.cache.NumPendingData()
@@ -376,7 +376,7 @@ func (e *Executor) produceBlock() error {
 		}
 	}
 
-	// Get batch from sequencer
+	// get batch from sequencer
 	batchData, err := e.retrieveBatch(e.ctx)
 	if errors.Is(err, common.ErrNoBatch) {
 		e.logger.Debug().Msg("no batch available")
@@ -387,55 +387,47 @@ func (e *Executor) produceBlock() error {
 		return fmt.Errorf("failed to retrieve batch: %w", err)
 	}
 
-	// Create block
 	header, data, err := e.createBlock(e.ctx, newHeight, batchData)
 	if err != nil {
 		return fmt.Errorf("failed to create block: %w", err)
 	}
 
-	// Apply block to get new state
 	newState, err := e.applyBlock(e.ctx, header.Header, data)
 	if err != nil {
 		return fmt.Errorf("failed to apply block: %w", err)
 	}
 
-	// Sign the header
 	signature, err := e.signHeader(header.Header)
 	if err != nil {
 		return fmt.Errorf("failed to sign header: %w", err)
 	}
 	header.Signature = signature
 
-	// Validate block
 	if err := e.validateBlock(currentState, header, data); err != nil {
 		return fmt.Errorf("failed to validate block: %w", err)
 	}
 
-	// Save block
 	if err := e.store.SaveBlockData(e.ctx, header, data, &signature); err != nil {
 		return fmt.Errorf("failed to save block: %w", err)
 	}
 
-	// Update store height
 	if err := e.store.SetHeight(e.ctx, newHeight); err != nil {
 		return fmt.Errorf("failed to update store height: %w", err)
 	}
 
-	// Update state
 	if err := e.updateState(e.ctx, newState); err != nil {
 		return fmt.Errorf("failed to update state: %w", err)
 	}
 
-	// Broadcast header and data to P2P network
+	// broadcast header and data to P2P network
 	g, ctx := errgroup.WithContext(e.ctx)
 	g.Go(func() error { return e.headerBroadcaster.WriteToStoreAndBroadcast(ctx, header) })
 	g.Go(func() error { return e.dataBroadcaster.WriteToStoreAndBroadcast(ctx, data) })
 	if err := g.Wait(); err != nil {
 		e.logger.Error().Err(err).Msg("failed to broadcast header and/data")
-		// Don't fail block production on broadcast error
+		// don't fail block production on broadcast error
 	}
 
-	// Record metrics
 	e.recordBlockMetrics(data)
 
 	e.logger.Info().

node/full.go

@@ -59,7 +59,7 @@ type FullNode struct {
 	hSyncService    *evsync.HeaderSyncService
 	dSyncService    *evsync.DataSyncService
 	Store           store.Store
-	blockComponents *block.BlockComponents
+	blockComponents *block.Components
 
 	prometheusSrv *http.Server
 	pprofSrv      *http.Server
@@ -97,7 +97,7 @@ func newFullNode(
 		return nil, err
 	}
 
-	var blockComponents *block.BlockComponents
+	var blockComponents *block.Components
 	if nodeConfig.Node.Aggregator {
 		blockComponents, err = block.NewAggregatorComponents(
 			nodeConfig,