renaming as per feedback

Author: julienrbrt

block/node.go block/components.goblock/node.go renamed to block/components.go

@@ -115,10 +115,10 @@ type broadcaster[T any] interface {
 	WriteToStoreAndBroadcast(ctx context.Context, payload T) error
 }
 
-// NewSyncNode creates components for a non-aggregator full node that can only sync blocks.
+// NewSyncComponents creates components for a non-aggregator full node that can only sync blocks.
 // Non-aggregator full nodes can sync from P2P and DA but cannot produce blocks or submit to DA.
 // They have more sync capabilities than light nodes but no block production. No signer required.
-func NewSyncNode(
+func NewSyncComponents(
 	config config.Config,
 	genesis genesis.Genesis,
 	store store.Store,
@@ -176,10 +176,10 @@ func NewSyncNode(
 	}, nil
 }
 
-// NewAggregatorNode creates components for an aggregator full node that can produce and sync blocks.
+// NewAggregatorComponents creates components for an aggregator full node that can produce and sync blocks.
 // Aggregator nodes have full capabilities - they can produce blocks, sync from P2P and DA,
 // and submit headers/data to DA. Requires a signer for block production and DA submission.
-func NewAggregatorNode(
+func NewAggregatorComponents(
 	config config.Config,
 	genesis genesis.Genesis,
 	store store.Store,

block/node_test.go block/components_test.goblock/node_test.go renamed to block/components_test.go

@@ -79,7 +79,7 @@ func TestBlockComponents_StartStop_Lifecycle(t *testing.T) {
 	assert.Contains(t, err.Error(), "context")
 }
 
-func TestNewSyncNode_Creation(t *testing.T) {
+func TestNewSyncComponents_Creation(t *testing.T) {
 	ds := sync.MutexWrap(datastore.NewMapDatastore())
 	memStore := store.New(ds)
 
@@ -96,7 +96,7 @@ func TestNewSyncNode_Creation(t *testing.T) {
 
 	// Just test that the constructor doesn't panic - don't start the components
 	// to avoid P2P store dependencies
-	components, err := NewSyncNode(
+	components, err := NewSyncComponents(
 		cfg,
 		gen,
 		memStore,
@@ -118,7 +118,7 @@ func TestNewSyncNode_Creation(t *testing.T) {
 	assert.Nil(t, components.Executor) // Sync nodes don't have executors
 }
 
-func TestNewAggregatorNode_Creation(t *testing.T) {
+func TestNewAggregatorComponents_Creation(t *testing.T) {
 	ds := sync.MutexWrap(datastore.NewMapDatastore())
 	memStore := store.New(ds)
 
@@ -140,7 +140,7 @@ func TestNewAggregatorNode_Creation(t *testing.T) {
 	mockSigner, err := noop.NewNoopSigner(priv)
 	require.NoError(t, err)
 
-	components, err := NewAggregatorNode(
+	components, err := NewAggregatorComponents(
 		cfg,
 		gen,
 		memStore,
@@ -211,7 +211,7 @@ func TestExecutor_RealExecutionClientFailure_StopsNode(t *testing.T) {
 		Return(nil, uint64(0), criticalError).Maybe()
 
 	// Create aggregator node
-	components, err := NewAggregatorNode(
+	components, err := NewAggregatorComponents(
 		cfg,
 		gen,
 		memStore,

node/full.go

@@ -68,7 +68,6 @@ type FullNode struct {
 
 // newFullNode creates a new Rollkit full node.
 func newFullNode(
-	ctx context.Context,
 	nodeConfig config.Config,
 	p2pClient *p2p.Client,
 	signer signer.Signer,
@@ -100,7 +99,7 @@ func newFullNode(
 
 	var blockComponents *block.BlockComponents
 	if nodeConfig.Node.Aggregator {
-		blockComponents, err = block.NewAggregatorNode(
+		blockComponents, err = block.NewAggregatorComponents(
 			nodeConfig,
 			genesis,
 			rktStore,
@@ -115,7 +114,7 @@ func newFullNode(
 			nodeOpts.BlockOptions,
 		)
 	} else {
-		blockComponents, err = block.NewSyncNode(
+		blockComponents, err = block.NewSyncComponents(
 			nodeConfig,
 			genesis,
 			rktStore,

node/helpers.go

@@ -83,15 +83,6 @@ func getNodeHeightFromStore(node Node) (uint64, error) {
 	return 0, errors.New("not a full node or block components not initialized")
 }
 
-//nolint:unused
-func safeClose(ch chan struct{}) {
-	select {
-	case <-ch:
-	default:
-		close(ch)
-	}
-}
-
 // waitForAtLeastNBlocks waits for the node to have at least n blocks
 func waitForAtLeastNBlocks(node Node, n uint64, source Source) error {
 	return Retry(300, 100*time.Millisecond, func() error {

node/helpers_test.go

@@ -106,15 +106,12 @@ func newTestNode(
 	ds datastore.Batching,
 	stopDAHeightTicker func(),
 ) (*FullNode, func()) {
-	ctx, cancel := context.WithCancel(context.Background())
-
 	// Generate genesis and keys
 	genesis, genesisValidatorKey, _ := types.GetGenesisWithPrivkey("test-chain")
 	remoteSigner, err := remote_signer.NewNoopSigner(genesisValidatorKey)
 	require.NoError(t, err)
 
 	node, err := NewNode(
-		ctx,
 		config,
 		executor,
 		sequencer,
@@ -130,7 +127,6 @@ func newTestNode(
 	require.NoError(t, err)
 
 	cleanup := func() {
-		cancel()
 		if stopDAHeightTicker != nil {
 			stopDAHeightTicker()
 		}
@@ -164,8 +160,6 @@ func createNodesWithCleanup(t *testing.T, num int, config evconfig.Config) ([]*F
 
 	nodes := make([]*FullNode, num)
 	cleanups := make([]func(), num)
-	// Create a cancellable context instead of using background context
-	aggCtx, aggCancel := context.WithCancel(context.Background())
 
 	// Generate genesis and keys
 	genesis, genesisValidatorKey, _ := types.GetGenesisWithPrivkey("test-chain")
@@ -179,7 +173,6 @@ func createNodesWithCleanup(t *testing.T, num int, config evconfig.Config) ([]*F
 	require.NoError(err)
 
 	aggNode, err := NewNode(
-		aggCtx,
 		config,
 		executor,
 		sequencer,
@@ -196,8 +189,6 @@ func createNodesWithCleanup(t *testing.T, num int, config evconfig.Config) ([]*F
 
 	// Update cleanup to cancel the context instead of calling Stop
 	cleanup := func() {
-		// Cancel the context to stop the node
-		aggCancel()
 		stopDAHeightTicker()
 	}
 
@@ -209,15 +200,13 @@ func createNodesWithCleanup(t *testing.T, num int, config evconfig.Config) ([]*F
 		peersList = append(peersList, aggPeerAddress)
 	}
 	for i := 1; i < num; i++ {
-		ctx, cancel := context.WithCancel(context.Background())
 		if aggPeers != "none" {
 			config.P2P.Peers = strings.Join(peersList, ",")
 		}
 		config.P2P.ListenAddress = fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", 40001+i)
 		config.RPC.Address = fmt.Sprintf("127.0.0.1:%d", 8001+i)
 		executor, sequencer, _, p2pClient, _, nodeP2PKey, stopDAHeightTicker := createTestComponents(t, config)
 		node, err := NewNode(
-			ctx,
 			config,
 			executor,
 			sequencer,
@@ -233,8 +222,6 @@ func createNodesWithCleanup(t *testing.T, num int, config evconfig.Config) ([]*F
 		require.NoError(err)
 		// Update cleanup to cancel the context instead of calling Stop
 		cleanup := func() {
-			// Cancel the context to stop the node
-			cancel()
 			stopDAHeightTicker()
 		}
 		nodes[i], cleanups[i] = node.(*FullNode), cleanup

node/node.go

@@ -1,8 +1,6 @@
 package node
 
 import (
-	"context"
-
 	ds "github.com/ipfs/go-datastore"
 	"github.com/rs/zerolog"
 
@@ -32,7 +30,6 @@ type NodeOptions struct {
 // This is the entry point for composing a node, when compiling a node, you need to provide an executor
 // Example executors can be found in apps/
 func NewNode(
-	ctx context.Context,
 	conf config.Config,
 	exec coreexecutor.Executor,
 	sequencer coresequencer.Sequencer,
@@ -54,7 +51,6 @@ func NewNode(
 	}
 
 	return newFullNode(
-		ctx,
 		conf,
 		p2pClient,
 		signer,

node/single_sequencer_integration_test.go

@@ -1,5 +1,3 @@
-//go:build integration
-
 package node
 
 import (
@@ -263,7 +261,7 @@ func TestStateRecovery(t *testing.T) {
 	// Verify state persistence
 	recoveredHeight, err := getNodeHeight(node, Store)
 	require.NoError(err)
-	require.GreaterOrEqual(recoveredHeight, originalHeight)
+	require.GreaterOrEqual(recoveredHeight, originalHeight, "recovered height should be greater than or equal to original height")
 }
 
 // TestMaxPendingHeadersAndData verifies that the sequencer will stop producing blocks when the maximum number of pending headers or data is reached.

pkg/cmd/run_node.go

@@ -115,7 +115,6 @@ func StartNode(
 
 	// Create and start the node
 	rollnode, err := node.NewNode(
-		ctx,
 		nodeConfig,
 		executor,
 		sequencer,