SimulationValidator - extract out common method

Consensys · Oct 3, 2024 · fdb3b00 · fdb3b00
1 parent 39af637
commit fdb3b00
Showing 1 changed file with 18 additions and 41 deletions.
diff --git a/...n/java/net/consensys/linea/sequencer/txpoolvalidation/validators/SimulationValidator.java b/...n/java/net/consensys/linea/sequencer/txpoolvalidation/validators/SimulationValidator.java
@@ -99,21 +99,7 @@ public Optional<String> validateTransaction(
 
       if (moduleLimitResult.getResult() != ModuleLineCountValidator.ModuleLineCountResult.VALID) {
         final String reason = handleModuleOverLimit(transaction, moduleLimitResult);
-
-        // Report rejected transactions to the JSON-RPC manager
-        rejectedTxJsonRpcManager.ifPresent(
-            jsonRpcManager -> {
-              final String jsonRpcCall =
-                  JsonRpcRequestBuilder.generateSaveRejectedTxJsonRpc(
-                      jsonRpcManager.getNodeType(),
-                      transaction,
-                      Instant.now(),
-                      Optional.empty(), // block number is not available
-                      reason,
-                      List.of());
-              jsonRpcManager.submitNewJsonRpcCall(jsonRpcCall);
-            });
-
+        reportRejectedTransaction(transaction, reason);
         return Optional.of(reason);
       }
 
@@ -124,19 +110,7 @@ public Optional<String> validateTransaction(
               "Invalid transaction"
                   + simulationResult.getInvalidReason().map(ir -> ": " + ir).orElse("");
           log.debug(errMsg);
-          // Report rejected transactions to the JSON-RPC manager
-          rejectedTxJsonRpcManager.ifPresent(
-              jsonRpcManager -> {
-                final String jsonRpcCall =
-                    JsonRpcRequestBuilder.generateSaveRejectedTxJsonRpc(
-                        jsonRpcManager.getNodeType(),
-                        transaction,
-                        Instant.now(),
-                        Optional.empty(), // block number is not available
-                        errMsg,
-                        List.of());
-                jsonRpcManager.submitNewJsonRpcCall(jsonRpcCall);
-              });
+          reportRejectedTransaction(transaction, errMsg);
           return Optional.of(errMsg);
         }
         if (!simulationResult.isSuccessful()) {
@@ -147,19 +121,7 @@ public Optional<String> validateTransaction(
                       .map(rr -> ": " + rr.toHexString())
                       .orElse("");
           log.debug(errMsg);
-          // Report rejected transactions to the JSON-RPC manager
-          rejectedTxJsonRpcManager.ifPresent(
-              jsonRpcManager -> {
-                final String jsonRpcCall =
-                    JsonRpcRequestBuilder.generateSaveRejectedTxJsonRpc(
-                        jsonRpcManager.getNodeType(),
-                        transaction,
-                        Instant.now(),
-                        Optional.empty(), // block number is not available
-                        errMsg,
-                        List.of());
-                jsonRpcManager.submitNewJsonRpcCall(jsonRpcCall);
-              });
+          reportRejectedTransaction(transaction, errMsg);
           return Optional.of(errMsg);
         }
       }
@@ -176,6 +138,21 @@ public Optional<String> validateTransaction(
     return Optional.empty();
   }
 
+  private void reportRejectedTransaction(final Transaction transaction, final String reason) {
+    rejectedTxJsonRpcManager.ifPresent(
+        jsonRpcManager -> {
+          final String jsonRpcCall =
+              JsonRpcRequestBuilder.generateSaveRejectedTxJsonRpc(
+                  jsonRpcManager.getNodeType(),
+                  transaction,
+                  Instant.now(),
+                  Optional.empty(), // block number is not available
+                  reason,
+                  List.of());
+          jsonRpcManager.submitNewJsonRpcCall(jsonRpcCall);
+        });
+  }
+
   private void logSimulationResult(
       final Transaction transaction,
       final boolean isLocal,