Code refactoring in ExecutionBlockRetriever

rsksmart · Nov 7, 2022 · 45a7a49 · 45a7a49
1 parent 8c2f11e
commit 45a7a49
Showing 1 changed file with 35 additions and 20 deletions.
diff --git a/rskj-core/src/main/java/co/rsk/rpc/ExecutionBlockRetriever.java b/rskj-core/src/main/java/co/rsk/rpc/ExecutionBlockRetriever.java
@@ -68,26 +68,7 @@ public Result retrieveExecutionBlock(String bnOrId) {
         }
 
         if (PENDING_ID.equals(bnOrId)) {
-            Block bestBlock = blockchain.getBestBlock();
-            Result result = cachedPendingBlockResult.get();
-            // optimistic check without the lock
-            if (result != null && result.getBlock().getParentHash().equals(bestBlock.getHash())) {
-                return result;
-            }
-
-            synchronized (pendingBlockLock) {
-                // build a new pending block, but before that just in case check if one hasn't been built while being locked
-                bestBlock = blockchain.getBestBlock();
-                result = cachedPendingBlockResult.get();
-                if (result != null && result.getBlock().getParentHash().equals(bestBlock.getHash())) {
-                    return result;
-                }
-
-                result = Result.ofBlockResult(builder.buildPending(bestBlock.getHeader()));
-                cachedPendingBlockResult.set(result);
-
-                return result;
-            }
+            return getPendingBlockResult();
         }
 
         // Is the block specifier either a hexadecimal or decimal number?
@@ -114,6 +95,40 @@ public Result retrieveExecutionBlock(String bnOrId) {
                 bnOrId));
     }
 
+    @Nonnull
+    private Result getPendingBlockResult() {
+        Block bestBlock = blockchain.getBestBlock();
+
+        // optimistic check without the lock
+        Result result = getCachedResultFor(bestBlock);
+        if (result != null) {
+            return result;
+        }
+
+        synchronized (pendingBlockLock) {
+            // build a new pending block, but before that just in case check if one hasn't been built while being locked
+            bestBlock = blockchain.getBestBlock();
+            result = getCachedResultFor(bestBlock);
+            if (result != null) {
+                return result;
+            }
+
+            result = Result.ofBlockResult(builder.buildPending(bestBlock.getHeader()));
+            cachedPendingBlockResult.set(result);
+
+            return result;
+        }
+    }
+
+    @Nullable
+    private Result getCachedResultFor(@Nonnull Block bestBlock) {
+        Result result = cachedPendingBlockResult.get();
+        if (result != null && result.getBlock().getParentHash().equals(bestBlock.getHash())) {
+            return result;
+        }
+        return null;
+    }
+
     @VisibleForTesting
     Result getCachedPendingBlockResult() {
         return cachedPendingBlockResult.get();