x

Author: alpe

apps/grpc/single/cmd/run.go

@@ -14,7 +14,6 @@ import (
 	rollcmd "github.com/evstack/ev-node/pkg/cmd"
 	"github.com/evstack/ev-node/pkg/config"
 	rollgenesis "github.com/evstack/ev-node/pkg/genesis"
-	"github.com/evstack/ev-node/pkg/p2p"
 	"github.com/evstack/ev-node/pkg/p2p/key"
 	"github.com/evstack/ev-node/pkg/store"
 	"github.com/evstack/ev-node/sequencers/single"
@@ -100,14 +99,8 @@ The execution client must implement the Evolve execution gRPC interface.`,
 			return err
 		}
 
-		// Create P2P client
-		p2pClient, err := p2p.NewClient(nodeConfig.P2P, nodeKey.PrivKey, datastore, genesis.ChainID, logger, nil)
-		if err != nil {
-			return err
-		}
-
 		// Start the node
-		return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, p2pClient, datastore, nodeConfig, genesis, node.NodeOptions{})
+		return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, nodeKey, datastore, nodeConfig, genesis, node.NodeOptions{})
 	},
 }
 

block/internal/executing/executor.go

@@ -105,8 +105,11 @@ func NewExecutor(
 	if !bytes.Equal(addr, genesis.ProposerAddress) {
 		return nil, common.ErrNotProposer
 	}
+	if raftNode != nil && reflect.ValueOf(raftNode).IsNil() {
+		raftNode = nil
+	}
 
-	return &Executor{
+	e := &Executor{
 		store:             store,
 		exec:              exec,
 		sequencer:         sequencer,
@@ -123,7 +126,9 @@ func NewExecutor(
 		txNotifyCh:        make(chan struct{}, 1),
 		errorCh:           errorCh,
 		logger:            logger.With().Str("component", "executor").Logger(),
-	}, nil
+	}
+
+	return e, nil
 }
 
 // Start begins the execution component
@@ -317,7 +322,7 @@ func (e *Executor) produceBlock() error {
 	}()
 
 	// Check raft leadership if raft is enabled
-	if !reflect.ValueOf(e.raftNode).IsNil() && !e.raftNode.IsLeader() {
+	if e.raftNode != nil && !e.raftNode.IsLeader() {
 		return errors.New("not raft leader")
 	}
 
@@ -429,7 +434,7 @@ func (e *Executor) produceBlock() error {
 	e.metrics.Height.Set(float64(newState.LastBlockHeight))
 
 	// Propose block to raft before p2p broadcast if raft is enabled
-	if !reflect.ValueOf(e.raftNode).IsNil() {
+	if e.raftNode != nil {
 		headerBytes, err := header.MarshalBinary()
 		if err != nil {
 			return fmt.Errorf("failed to marshal header: %w", err)

block/internal/syncing/syncer.go

@@ -109,7 +109,7 @@ func NewSyncer(
 		errorCh:     errorCh,
 		logger:      logger.With().Str("component", "syncer").Logger(),
 	}
-	if !reflect.ValueOf(raftNode).IsNil() {
+	if raftNode != nil && !reflect.ValueOf(raftNode).IsNil() {
 		s.raftRetriever = newRaftRetriever(raftNode, genesis, logger, eventProcessorFn(s.pipeEvent))
 	}
 	return s

pkg/raft/node.go

@@ -159,6 +159,9 @@ func (n *Node) Stop() error {
 
 // IsLeader returns true if this node is the raft leader
 func (n *Node) IsLeader() bool {
+	if n == nil || n.raft == nil {
+		return false
+	}
 	return n.raft.State() == raft.Leader
 }
 func (n *Node) NodeID() string {

test/e2e/sut_helper.go

@@ -160,8 +160,10 @@ func (s *SystemUnderTest) watchLogs(cmd *exec.Cmd) {
 	require.NoError(s.t, err)
 
 	if s.debug {
-		_ = os.MkdirAll("./testnet", 0o750)
-		logfileName := filepath.Join("./testnet", fmt.Sprintf("exec-%s-%s-%d.out", filepath.Base(cmd.Args[0]), s.t.Name(), time.Now().UnixNano()))
+		logDir := filepath.Join(WorkDir, "testnet")
+		require.NoError(s.t, os.MkdirAll(logDir, 0o750))
+		testName := strings.ReplaceAll(s.t.Name(), "/", "-")
+		logfileName := filepath.Join(logDir, fmt.Sprintf("exec-%s-%s-%d.out", filepath.Base(cmd.Args[0]), testName, time.Now().UnixNano()))
 		logfile, err := os.Create(logfileName)
 		require.NoError(s.t, err)
 		errReader = io.NopCloser(io.TeeReader(errReader, logfile))