address pr comments

go/enclave/nodetype/sequencer.go

@@ -141,7 +141,7 @@ func (s *sequencer) createGenesisBatch(block *common.L1Block) error {
 	// this is the actual first block produced in chain
 	err = s.blockchain.IngestNewBlock(batch)
 	if err != nil {
-		return fmt.Errorf("unable to remove ingest new block into eth blockchain - %w", err)
+		return fmt.Errorf("failed to feed batch into the virtual eth chain - %w", err)
 	}
 
 	// the mempool can only be started after at least 1 block is in the blockchain object
@@ -282,7 +282,7 @@ func (s *sequencer) produceBatch(
 	// add the batch to the chain so it can remove pending transactions from the pool
 	err = s.blockchain.IngestNewBlock(cb.Batch)
 	if err != nil {
-		return nil, fmt.Errorf("unable to remove tx from mempool - %w", err)
+		return nil, fmt.Errorf("failed to feed batch into the virtual eth chain - %w", err)
 	}
 
 	return cb, nil

go/enclave/nodetype/validator.go

@@ -108,11 +108,11 @@ func (val *obsValidator) ExecuteStoredBatches() error {
 			if err != nil {
 				return fmt.Errorf("could not store executed batch %s. Cause: %w", batch.Hash(), err)
 			}
-			val.batchRegistry.OnBatchExecuted(batch, receipts)
 			err = val.mempool.Chain.IngestNewBlock(batch)
 			if err != nil {
-				return fmt.Errorf("unable to remove ingest new block into eth blockchain - %w", err)
+				return fmt.Errorf("failed to feed batch into the virtual eth chain- %w", err)
 			}
+			val.batchRegistry.OnBatchExecuted(batch, receipts)
 		}
 	}
 	return nil

integration/constants.go

@@ -3,7 +3,9 @@ package integration
 // Tracks the start ports handed out to different tests, in a bid to minimise conflicts.
 const (
 	StartPortEth2NetworkTests        = 10000
+	StartPortTenscanUnitTest         = 12000
 	StartPortNodeRunnerTest          = 14000
+	StartPortTenGatewayUnitTest      = 16000
 	StartPortSimulationGethInMem     = 18000
 	StartPortSimulationInMem         = 22000
 	StartPortSimulationFullNetwork   = 26000
@@ -13,8 +15,6 @@ const (
 	StartPortWalletExtensionUnitTest = 38000
 	StartPortFaucetUnitTest          = 42000
 	StartPortFaucetHTTPUnitTest      = 48000
-	StartPortTenscanUnitTest         = 12000
-	StartPortTenGatewayUnitTest      = 16000
 
 	DefaultGethWSPortOffset         = 100
 	DefaultGethAUTHPortOffset       = 200