WIP: revorking tests

tac0turtle · Apr 22, 2025 · Nov 17, 2024 · Nov 27, 2024 · Dec 3, 2024 · Dec 10, 2024
commit c93989bee5560aa5778ec2857889e112de19364a
diff --git a/block/manager.go b/block/manager.go
@@ -418,6 +418,14 @@ func (m *Manager) getRemainingSleep(start time.Time) time.Duration {
 	return 0
 }
 
+// GetExecutor returns the executor used by the manager.
+//
+// Note: this is a temporary method to allow testing the manager.
+// It will be removed once the manager is fully integrated with the execution client.
+func (m *Manager) GetExecutor() execution.Executor {
+	return m.exec
+}
+
 // BatchRetrieveLoop is responsible for retrieving batches from the sequencer.
 func (m *Manager) BatchRetrieveLoop(ctx context.Context) {
 	// Initialize batchTimer to fire immediately on start

diff --git a/node/execution_test.go b/node/execution_test.go
@@ -0,0 +1,79 @@
+package node
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestBasicExecutionFlow(t *testing.T) {
+	require := require.New(t)
+
+	// Setup node
+	node, cleanup := setupTestNodeWithCleanup(t)
+	defer cleanup()
+
+	//startNodeWithCleanup(t, node)
+
+	ctx := context.Background()
+
+	// Give node time to initialize
+	time.Sleep(100 * time.Millisecond)
+
+	// Test InitChain - we don't need to call this explicitly as it's done during node start
+	executor := node.blockManager.GetExecutor()
+	require.NotNil(executor)
+
+	// Test GetTxs
+	txs, err := executor.GetTxs(ctx)
+	require.NoError(err)
+
+	lastState, err := node.Store.GetState(ctx)
+	require.NoError(err)
+
+	// Test ExecuteTxs
+	newStateRoot, newMaxBytes, err := executor.ExecuteTxs(ctx, txs, 1, time.Now(), lastState.LastResultsHash)
+	require.NoError(err)
+	require.Greater(newMaxBytes, uint64(0))
+	t.Logf("newStateRoot: %s %d", newStateRoot, newMaxBytes)
+	require.NotEmpty(newStateRoot)
+
+	// Test SetFinal
+	err = executor.SetFinal(ctx, 1)
+	require.NoError(err)
+}
+
+func TestExecutionWithDASync(t *testing.T) {
+	t.Run("basic DA sync", func(t *testing.T) {
+		require := require.New(t)
+
+		// Setup node with mock DA
+		node, cleanup := setupTestNodeWithCleanup(t)
+		defer cleanup()
+
+		// Start node
+		err := node.Start()
+		require.NoError(err)
+		defer func() {
+			err := node.Stop()
+			require.NoError(err)
+		}()
-		var wg sync.WaitGroup
-		errCh := make(chan error, 1)
-
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			err := node.Run(ctx)
-			select {
-			case errCh <- err:
-			default:
-				t.Logf("Error channel full, discarding error: %v", err)
-			}
-		}()
+		var wg sync.WaitGroup
+		errCh := make(chan error)
+ 
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			err := node.Run(ctx)
+			if err != nil && !errors.Is(err, context.Canceled) {
+				errCh <- err
+			}
+		}()
+ 
+		// Use a separate goroutine to monitor for errors
+		go func() {
+			select {
+			case err := <-errCh:
+				t.Errorf("Node stopped unexpectedly: %v", err)
+				cancel() // Stop the test
+			case <-ctx.Done():
+				// Test is ending normally
+			}
+		}()
-		var wg sync.WaitGroup
-		errCh := make(chan error, 1)
-
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			err := node.Run(ctx)
-			select {
-			case errCh <- err:
-			default:
-				t.Logf("Error channel full, discarding error: %v", err)
-			}
-		}()
+		var wg sync.WaitGroup
+		errCh := make(chan error)
+ 
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			err := node.Run(ctx)
+			if err != nil && !errors.Is(err, context.Canceled) {
+				errCh <- err
+			}
+		}()
+ 
+		// Use a separate goroutine to monitor for errors
+		go func() {
+			select {
+			case err := <-errCh:
+				t.Errorf("Node stopped unexpectedly: %v", err)
+				cancel() // Stop the test
+			case <-ctx.Done():
+				// Test is ending normally
+			}
+		}()
+
+		// Give node time to initialize
+		time.Sleep(100 * time.Millisecond)
+
+		// Verify DA client is working
+		require.NotNil(node.dalc)
+
+		// Wait for first block to be produced
+		err = waitForFirstBlock(node, Header)
+		require.NoError(err)
-		err = waitForFirstBlock(node, Header)
-		require.NoError(err)
+		err = waitForFirstBlock(node)
+		require.NoError(err)
-		err = waitForFirstBlock(node, Header)
-		require.NoError(err)
+		err = waitForFirstBlock(node)
+		require.NoError(err)
+
+		// Get height and verify it's greater than 0
+		height, err := getNodeHeight(node, Header)
+		require.NoError(err)
-		height, err := getNodeHeight(node, Header)
-		require.NoError(err)
+		height, err := getNodeHeight(node)
+		require.NoError(err)
-		height, err := getNodeHeight(node, Header)
-		require.NoError(err)
+		height, err := getNodeHeight(node)
+		require.NoError(err)
+		require.Greater(height, uint64(0))
+	})
+}
diff --git a/node/full.go b/node/full.go
@@ -149,6 +149,7 @@ func newFullNode(
 	seqClient := seqGRPC.NewClient()
 
 	store := store.New(mainKV)
+
 	blockManager, err := initBlockManager(signingKey, nodeConfig, genesis, store, seqClient, dalc, eventBus, logger, headerSyncService, dataSyncService, seqMetrics, smMetrics)
 	if err != nil {
 		return nil, err

diff --git a/node/full_node.md b/node/full_node.md
@@ -14,10 +14,6 @@ Note that unlike a light node which only syncs and stores block headers seen on
 
 The Full Node mainly encapsulates and initializes/manages the following components:
 
-### proxyApp
-
-The Cosmos SDK start script passes a client creator constructed using the relevant Cosmos SDK application to the Full Node's constructor which is then used to create the proxy app interface. When the proxy app is started, it establishes different [ABCI app connections] including Mempool, Consensus, Query, and Snapshot. The full node uses this interface to interact with the application.
-
 ### genesisDoc
 
 The [genesis] document contains information about the initial state of the rollup chain, in particular its validator set.
@@ -70,30 +66,27 @@ See [full node]
 
 [1] [Full Node][full node]
 
-[2] [ABCI Methods][ABCI app connections]
-
-[3] [Genesis Document][genesis]
+[2] [Genesis Document][genesis]
 
-[4] [Node Configuration][node configuration]
+[3] [Node Configuration][node configuration]
 
-[5] [Peer to Peer Client][peer-to-peer client]
+[4] [Peer to Peer Client][peer-to-peer client]
 
-[6] [Mempool][Mempool]
+[5] [Mempool][Mempool]
 
-[7] [Store][Store]
+[6] [Store][Store]
 
-[8] [Store Interface][store interface]
+[7] [Store Interface][store interface]
 
-[9] [Block Manager][block manager]
+[8] [Block Manager][block manager]
 
-[10] [Data Availability Layer Client][dalc]
+[9] [Data Availability Layer Client][dalc]
 
-[11] [Header Sync Service][Header Sync Service]
+[10] [Header Sync Service][Header Sync Service]
 
-[12] [Block Sync Service][Block Sync Service]
+[11] [Block Sync Service][Block Sync Service]
 
 [full node]: https://github.com/rollkit/rollkit/blob/main/node/full.go
-[ABCI app connections]: https://github.com/cometbft/cometbft/blob/main/spec/abci/abci%2B%2B_basic_concepts.md
 [genesis]: https://github.com/cometbft/cometbft/blob/main/spec/core/genesis.md
 [node configuration]: https://github.com/rollkit/rollkit/blob/main/config/config.go
 [peer-to-peer client]: https://github.com/rollkit/rollkit/blob/main/p2p/client.go