cr fix

interop/executor.go

@@ -163,15 +163,14 @@ func (e *Executor) Execute(ctx context.Context, signedTx tx.SignedTx) error {
 	}
 	log.Debugf("get batch by number: %v", batch)
 
-	if batch == nil && (signedTx.Tx.ZKP.NewStateRoot != common.Hash{} || signedTx.Tx.ZKP.NewLocalExitRoot != common.Hash{}) {
+	if batch == nil {
 		return fmt.Errorf(
-			"Mismatch detected, expected local exit root: %s actual: %s. expected state root: %s actual: %s",
-			signedTx.Tx.ZKP.NewLocalExitRoot.Hex(),
-			common.Hash{}.Hex(),
-			signedTx.Tx.ZKP.NewStateRoot.Hex(),
-			common.Hash{}.Hex(),
+			"unable to perform soundness check because batch number %v is undefined",
+			signedTx.Tx.NewVerifiedBatch,
 		)
-	} else if batch != nil && (batch.StateRoot != signedTx.Tx.ZKP.NewStateRoot || batch.LocalExitRoot != signedTx.Tx.ZKP.NewLocalExitRoot) {
+	}
+
+	if batch.StateRoot != signedTx.Tx.ZKP.NewStateRoot || batch.LocalExitRoot != signedTx.Tx.ZKP.NewLocalExitRoot {
 		return fmt.Errorf(
 			"Mismatch detected, expected local exit root: %s actual: %s. expected state root: %s actual: %s",
 			signedTx.Tx.ZKP.NewLocalExitRoot.Hex(),

interop/executor_test.go

@@ -166,6 +166,19 @@ func TestExecutor_VerifySignature(t *testing.T) {
 func TestExecutor_Execute(t *testing.T) {
 	t.Parallel()
 
+	// Create a sample signed transaction for testing
+	signedTx := tx.SignedTx{
+		Tx: tx.Tx{
+			LastVerifiedBatch: 0,
+			NewVerifiedBatch:  1,
+			ZKP: tx.ZKP{
+				NewStateRoot:     common.BytesToHash([]byte("sampleNewStateRoot")),
+				NewLocalExitRoot: common.BytesToHash([]byte("sampleNewLocalExitRoot")),
+				Proof:            []byte("sampleProof"),
+			},
+		},
+	}
+
 	t.Run("Batch is not nil and roots match", func(t *testing.T) {
 		t.Parallel()
 
@@ -176,19 +189,6 @@ func TestExecutor_Execute(t *testing.T) {
 
 		executor := New(log.WithFields("test", "test"), cfg, interopAdminAddr, etherman, ethTxManager)
 
-		// Create a sample signed transaction for testing
-		signedTx := tx.SignedTx{
-			Tx: tx.Tx{
-				LastVerifiedBatch: 0,
-				NewVerifiedBatch:  1,
-				ZKP: tx.ZKP{
-					NewStateRoot:     common.BytesToHash([]byte("sampleNewStateRoot")),
-					NewLocalExitRoot: common.BytesToHash([]byte("sampleNewLocalExitRoot")),
-					Proof:            []byte("sampleProof"),
-				},
-			},
-		}
-
 		// Mock the ZkEVMClientCreator.NewClient method
 		mockZkEVMClientCreator := mocks.NewZkEVMClientClientCreatorMock(t)
 		mockZkEVMClient := mocks.NewZkEVMClientMock(t)
@@ -210,7 +210,7 @@ func TestExecutor_Execute(t *testing.T) {
 		mockZkEVMClient.AssertExpectations(t)
 	})
 
-	t.Run("Returns expected error when Batch is nil and roots do not match", func(t *testing.T) {
+	t.Run("Returns expected error when Batch is nil", func(t *testing.T) {
 		t.Parallel()
 
 		cfg := &config.Config{}
@@ -220,19 +220,6 @@ func TestExecutor_Execute(t *testing.T) {
 
 		executor := New(log.WithFields("test", "test"), cfg, interopAdminAddr, etherman, ethTxManager)
 
-		// Create a sample signed transaction for testing
-		signedTx := tx.SignedTx{
-			Tx: tx.Tx{
-				LastVerifiedBatch: 0,
-				NewVerifiedBatch:  1,
-				ZKP: tx.ZKP{
-					NewStateRoot:     common.BytesToHash([]byte("sampleNewStateRoot")),
-					NewLocalExitRoot: common.BytesToHash([]byte("sampleNewLocalExitRoot")),
-					Proof:            []byte("sampleProof"),
-				},
-			},
-		}
-
 		// Mock the ZkEVMClientCreator.NewClient method
 		mockZkEVMClientCreator := mocks.NewZkEVMClientClientCreatorMock(t)
 		mockZkEVMClient := mocks.NewZkEVMClientMock(t)
@@ -247,56 +234,13 @@ func TestExecutor_Execute(t *testing.T) {
 		err := executor.Execute(context.Background(), signedTx)
 		require.Error(t, err)
 		expectedError := fmt.Sprintf(
-			"Mismatch detected, expected local exit root: %s actual: %s. expected state root: %s actual: %s",
-			signedTx.Tx.ZKP.NewLocalExitRoot.Hex(),
-			common.Hash{}.Hex(),
-			signedTx.Tx.ZKP.NewStateRoot.Hex(),
-			common.Hash{}.Hex(),
+			"unable to perform soundness check because batch number %v is undefined",
+			signedTx.Tx.NewVerifiedBatch,
 		)
 		assert.Contains(t, err.Error(), expectedError)
 		mockZkEVMClientCreator.AssertExpectations(t)
 		mockZkEVMClient.AssertExpectations(t)
 	})
-
-	t.Run("Batch is nil and roots match", func(t *testing.T) {
-		t.Parallel()
-
-		cfg := &config.Config{}
-		interopAdminAddr := common.HexToAddress("0x1234567890abcdef")
-		etherman := mocks.NewEthermanMock(t)
-		ethTxManager := mocks.NewEthTxManagerMock(t)
-
-		executor := New(log.WithFields("test", "test"), cfg, interopAdminAddr, etherman, ethTxManager)
-
-		// Create a sample signed transaction for testing
-		signedTx := tx.SignedTx{
-			Tx: tx.Tx{
-				LastVerifiedBatch: 0,
-				NewVerifiedBatch:  1,
-				ZKP: tx.ZKP{
-					NewStateRoot:     common.Hash{},
-					NewLocalExitRoot: common.Hash{},
-					Proof:            []byte("sampleProof"),
-				},
-			},
-		}
-
-		// Mock the ZkEVMClientCreator.NewClient method
-		mockZkEVMClientCreator := mocks.NewZkEVMClientClientCreatorMock(t)
-		mockZkEVMClient := mocks.NewZkEVMClientMock(t)
-
-		mockZkEVMClientCreator.On("NewClient", mock.Anything).Return(mockZkEVMClient).Once()
-		mockZkEVMClient.On("BatchByNumber", mock.Anything, big.NewInt(int64(signedTx.Tx.NewVerifiedBatch))).
-			Return(nil, nil).Once()
-
-		// Set the ZkEVMClientCreator to return the mock ZkEVMClient
-		executor.ZkEVMClientCreator = mockZkEVMClientCreator
-
-		err := executor.Execute(context.Background(), signedTx)
-		require.NoError(t, err)
-		mockZkEVMClientCreator.AssertExpectations(t)
-		mockZkEVMClient.AssertExpectations(t)
-	})
 }
 
 func TestExecutor_Settle(t *testing.T) {