Enhance ContractController to handle all remaining block types (pendi…

…ng, safe, finalized) (#6975) ContractController is modified, so that block with value "pending", "safe", "finalized" is treated as a "latest" block and could be passed by users. --------- Signed-off-by: Bilyana Gospodinova <[email protected]>
hashgraph · Oct 14, 2023 · e92f862 · e92f862
1 parent d794c2b
commit e92f862
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/viewmodel/BlockType.java b/hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/viewmodel/BlockType.java
@@ -20,21 +20,31 @@
 
 public record BlockType(String name, long number) {
 
+    private static final String HEX_PREFIX = "0x";
+
     public static final BlockType EARLIEST = new BlockType("earliest", 0L);
     public static final BlockType LATEST = new BlockType("latest", Long.MAX_VALUE);
-    public static final BlockType PENDING = new BlockType("pending", Long.MAX_VALUE);
-    private static final String HEX_PREFIX = "0x";
 
     public static BlockType of(final String value) {
+        if (StringUtils.isEmpty(value)) {
+            return LATEST;
+        }
 
-        if (StringUtils.isEmpty(value) || BlockType.LATEST.name().equalsIgnoreCase(value)) {
-            return BlockType.LATEST;
-        } else if (BlockType.EARLIEST.name().equalsIgnoreCase(value)) {
-            return BlockType.EARLIEST;
-        } else if (BlockType.PENDING.name().equalsIgnoreCase(value)) {
-            return BlockType.PENDING;
+        final String blockTypeName = value.toLowerCase();
+        switch (blockTypeName) {
+            case "earliest" -> {
+                return EARLIEST;
+            }
+            case "latest", "safe", "pending", "finalized" -> {
+                return LATEST;
+            }
+            default -> {
+                return extractNumericBlock(value);
+            }
         }
+    }
 
+    private static BlockType extractNumericBlock(String value) {
         int radix = 10;
         var cleanedValue = value;
 

diff --git a/...a-mirror-web3/src/test/java/com/hedera/mirror/web3/controller/ContractControllerTest.java b/...a-mirror-web3/src/test/java/com/hedera/mirror/web3/controller/ContractControllerTest.java
@@ -380,7 +380,7 @@ void transferWithoutSender() {
 
     @NullAndEmptySource
     @ParameterizedTest
-    @ValueSource(strings = {"earliest", "pending", "latest", "0", "0x1a"})
+    @ValueSource(strings = {"earliest", "latest", "0", "0x1a", "pending", "safe", "finalized"})
     void callValidBlockType(String value) {
         final var request = request();
         request.setBlock(BlockType.of(value));

diff --git a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/viewmodel/BlockTypeTest.java b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/viewmodel/BlockTypeTest.java
@@ -36,9 +36,7 @@ class BlockTypeTest {
         "earliest,0",
         "EARLIEST,0",
         "latest," + MAX_VALUE,
-        "latest," + MAX_VALUE,
-        "pending," + MAX_VALUE,
-        "PENDING," + MAX_VALUE,
+        "latest," + MAX_VALUE
     })
     @ParameterizedTest
     void valid(String value, long number) {
@@ -47,6 +45,13 @@ void valid(String value, long number) {
         assertThat(blockType).isNotNull().returns(valueLower, BlockType::name).returns(number, BlockType::number);
     }
 
+    @CsvSource({"pending", "PENDING", "safe", "SAFE", "finalized", "FINALIZED"})
+    @ParameterizedTest
+    void unsupportedDefaultToLatest(String value) {
+        var blockType = BlockType.of(value);
+        assertThat(blockType).isNotNull().returns(BlockType.LATEST.name(), BlockType::name);
+    }
+
     @ValueSource(strings = {MAX_VALUE + "1", "0xabcdefghijklmnopqrstuvwxyz", "abcdefghijklmnopqrstuvwxyz", "lastest"})
     @ParameterizedTest
     void invalid(String value) {