refactor(jsonrpc): check finalized in newFilter, not as a function

Author: waynercheung

framework/src/main/java/org/tron/core/services/jsonrpc/TronJsonRpcImpl.java

@@ -1115,14 +1115,6 @@ public void disableInPBFT(String method) throws JsonRpcMethodNotFoundException {
     }
   }
 
-  public void disableFinalizedBlock(FilterRequest fr) throws JsonRpcInvalidParamsException {
-    // not supports finalized as block parameter
-    if (FINALIZED_STR.equalsIgnoreCase(fr.getFromBlock())
-        || FINALIZED_STR.equalsIgnoreCase(fr.getToBlock())) {
-      throw new JsonRpcInvalidParamsException(INVALID_BLOCK_RANGE);
-    }
-  }
-
   @Override
   public TransactionJson buildTransaction(BuildArguments args)
       throws JsonRpcInvalidParamsException, JsonRpcInvalidRequestException,
@@ -1244,7 +1236,10 @@ public String newFilter(FilterRequest fr) throws JsonRpcInvalidParamsException,
     disableInPBFT("eth_newFilter");
 
     // not supports finalized as block parameter
-    disableFinalizedBlock(fr);
+    if (FINALIZED_STR.equalsIgnoreCase(fr.getFromBlock())
+        || FINALIZED_STR.equalsIgnoreCase(fr.getToBlock())) {
+      throw new JsonRpcInvalidParamsException(INVALID_BLOCK_RANGE);
+    }
 
     Map<String, LogFilterAndResult> eventFilter2Result;
     if (getSource() == RequestSource.FULLNODE) {

framework/src/test/java/org/tron/core/jsonrpc/JsonrpcServiceTest.java

@@ -645,47 +645,6 @@ public void testLogFilterWrapper() {
     }
   }
 
-  @Test
-  public void testDisableFinalizedBlock() {
-
-    try {
-      tronJsonRpc.disableFinalizedBlock(new FilterRequest(null, null, null, null, null));
-    } catch (Exception e) {
-      Assert.fail();
-    }
-
-    try {
-      tronJsonRpc.disableFinalizedBlock(new FilterRequest("finalized", null, null, null, null));
-    } catch (Exception e) {
-      Assert.assertEquals("invalid block range params", e.getMessage());
-    }
-
-    try {
-      tronJsonRpc.disableFinalizedBlock(new FilterRequest(null, "finalized", null, null, null));
-    } catch (Exception e) {
-      Assert.assertEquals("invalid block range params", e.getMessage());
-    }
-
-    try {
-      tronJsonRpc.disableFinalizedBlock(new FilterRequest("finalized", "latest", null, null, null));
-    } catch (Exception e) {
-      Assert.assertEquals("invalid block range params", e.getMessage());
-    }
-
-    try {
-      tronJsonRpc.disableFinalizedBlock(new FilterRequest("0x1", "finalized", null, null, null));
-    } catch (Exception e) {
-      Assert.assertEquals("invalid block range params", e.getMessage());
-    }
-
-    try {
-      tronJsonRpc.disableFinalizedBlock(
-          new FilterRequest("finalized", "finalized", null, null, null));
-    } catch (Exception e) {
-      Assert.assertEquals("invalid block range params", e.getMessage());
-    }
-  }
-
   @Test
   public void testNewFilterFinalizedBlock() {