rename config item to maxBlockFilterNum; delete new exception

Author: 317787106

common/src/main/java/org/tron/common/parameter/CommonParameter.java

@@ -529,7 +529,7 @@ public class CommonParameter {
   public int jsonRpcMaxSubTopics = 1000;
   @Getter
   @Setter
-  public int jsonRpcMaxFilterNum = 50000;
+  public int jsonRpcMaxBlockFilterNum = 50000;
 
   @Getter
   @Setter

common/src/main/java/org/tron/core/Constant.java

@@ -154,7 +154,7 @@ public class Constant {
   public static final String NODE_JSONRPC_HTTP_PBFT_PORT = "node.jsonrpc.httpPBFTPort";
   public static final String NODE_JSONRPC_MAX_BLOCK_RANGE = "node.jsonrpc.maxBlockRange";
   public static final String NODE_JSONRPC_MAX_SUB_TOPICS = "node.jsonrpc.maxSubTopics";
-  public static final String NODE_JSONRPC_MAX_FILTER_NUM = "node.jsonrpc.maxFilterNum";
+  public static final String NODE_JSONRPC_MAX_BLOCK_FILTER_NUM = "node.jsonrpc.maxBlockFilterNum";
 
   public static final String NODE_DISABLED_API_LIST = "node.disabledApi";
 

common/src/main/java/org/tron/core/exception/jsonrpc/JsonRpcTooManyFilterException.java

@@ -207,7 +207,7 @@ public static void clearParam() {
     PARAMETER.jsonRpcHttpPBFTNodeEnable = false;
     PARAMETER.jsonRpcMaxBlockRange = 5000;
     PARAMETER.jsonRpcMaxSubTopics = 1000;
-    PARAMETER.jsonRpcMaxFilterNum = 50000;
+    PARAMETER.jsonRpcMaxBlockFilterNum = 50000;
     PARAMETER.nodeMetricsEnable = false;
     PARAMETER.metricsStorageEnable = false;
     PARAMETER.metricsPrometheusEnable = false;
@@ -492,9 +492,9 @@ public static void setParam(final Config config) {
           config.getInt(Constant.NODE_JSONRPC_MAX_SUB_TOPICS);
     }
 
-    if (config.hasPath(Constant.NODE_JSONRPC_MAX_FILTER_NUM)) {
-      PARAMETER.jsonRpcMaxFilterNum =
-          config.getInt(Constant.NODE_JSONRPC_MAX_FILTER_NUM);
+    if (config.hasPath(Constant.NODE_JSONRPC_MAX_BLOCK_FILTER_NUM)) {
+      PARAMETER.jsonRpcMaxBlockFilterNum =
+          config.getInt(Constant.NODE_JSONRPC_MAX_BLOCK_FILTER_NUM);
     }
 
     if (config.hasPath(Constant.VM_MIN_TIME_RATIO)) {

framework/src/main/java/org/tron/core/config/args/Args.java

@@ -23,7 +23,6 @@
 import org.tron.core.exception.jsonrpc.JsonRpcInvalidParamsException;
 import org.tron.core.exception.jsonrpc.JsonRpcInvalidRequestException;
 import org.tron.core.exception.jsonrpc.JsonRpcMethodNotFoundException;
-import org.tron.core.exception.jsonrpc.JsonRpcTooManyFilterException;
 import org.tron.core.exception.jsonrpc.JsonRpcTooManyResultException;
 import org.tron.core.services.jsonrpc.types.BlockResult;
 import org.tron.core.services.jsonrpc.types.BuildArguments;
@@ -297,10 +296,10 @@ String newFilter(FilterRequest fr) throws JsonRpcInvalidParamsException,
 
   @JsonRpcMethod("eth_newBlockFilter")
   @JsonRpcErrors({
-      @JsonRpcError(exception = JsonRpcTooManyFilterException.class, code = -32005, data = "{}"),
+      @JsonRpcError(exception = JsonRpcInvalidRequestException.class, code = -32600, data = "{}"),
       @JsonRpcError(exception = JsonRpcMethodNotFoundException.class, code = -32601, data = "{}"),
   })
-  String newBlockFilter() throws JsonRpcTooManyFilterException, JsonRpcMethodNotFoundException;
+  String newBlockFilter() throws JsonRpcInvalidRequestException, JsonRpcMethodNotFoundException;
 
   @JsonRpcMethod("eth_uninstallFilter")
   @JsonRpcErrors({

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

@@ -66,7 +66,6 @@
 import org.tron.core.exception.jsonrpc.JsonRpcInvalidParamsException;
 import org.tron.core.exception.jsonrpc.JsonRpcInvalidRequestException;
 import org.tron.core.exception.jsonrpc.JsonRpcMethodNotFoundException;
-import org.tron.core.exception.jsonrpc.JsonRpcTooManyFilterException;
 import org.tron.core.exception.jsonrpc.JsonRpcTooManyResultException;
 import org.tron.core.services.NodeInfoService;
 import org.tron.core.services.http.JsonFormat;
@@ -114,7 +113,7 @@ public enum RequestSource {
 
   private static final String FILTER_NOT_FOUND = "filter not found";
   public static final int EXPIRE_SECONDS = 5 * 60;
-  private static final int maxFilterNum = Args.getInstance().getJsonRpcMaxFilterNum();
+  private static final int maxBlockFilterNum = Args.getInstance().getJsonRpcMaxBlockFilterNum();
   private static final Cache<LogFilterElement, LogFilterElement> logElementCache =
       CacheBuilder.newBuilder()
           .maximumSize(300_000L) // 300s * tps(1000) * 1 log/tx ≈ 300_000
@@ -1428,7 +1427,7 @@ public String newFilter(FilterRequest fr) throws JsonRpcInvalidParamsException,
 
   @Override
   public String newBlockFilter() throws JsonRpcMethodNotFoundException,
-      JsonRpcTooManyFilterException {
+      JsonRpcInvalidRequestException {
     disableInPBFT("eth_newBlockFilter");
 
     Map<String, BlockFilterAndResult> blockFilter2Result;
@@ -1437,8 +1436,9 @@ public String newBlockFilter() throws JsonRpcMethodNotFoundException,
     } else {
       blockFilter2Result = blockFilter2ResultSolidity;
     }
-    if (blockFilter2Result.size() >= maxFilterNum) {
-      throw new JsonRpcTooManyFilterException("exceed max block filters:  " + maxFilterNum);
+    if (blockFilter2Result.size() >= maxBlockFilterNum) {
+      throw new JsonRpcInvalidRequestException(
+          "exceed max block filters: " + maxBlockFilterNum + ", try later again");
     }
 
     BlockFilterAndResult filterAndResult = new BlockFilterAndResult();
@@ -1570,6 +1570,7 @@ public static Object[] getFilterResult(String filterId, Map<String, BlockFilterA
   @Override
   public void close() throws IOException {
     logElementCache.invalidateAll();
+    blockHashCache.invalidateAll();
     ExecutorServiceManager.shutdownAndAwaitTermination(sectionExecutor, esName);
   }
 

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

@@ -163,7 +163,7 @@ node {
     # httpPBFTPort = 8565
     # maxBlockRange = 5000
     # maxSubTopics = 1000
-    # maxFilterNum = 50000
+    # maxBlockFilterNum = 30000
   }
 
 }

framework/src/main/resources/config-localtest.conf

@@ -376,7 +376,7 @@ node {
     # should be > 0, otherwise means no limit.
     maxSubTopics = 1000
     # Allowed maximum number for blockFilter
-    maxFilterNum = 50000
+    maxBlockFilterNum = 50000
   }
 
   # Disabled api list, it will work for http, rpc and pbft, both FullNode and SolidityNode,

framework/src/main/resources/config.conf

@@ -0,0 +1,40 @@
+package org.tron.core.net.service.nodepersist;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Resource;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.tron.common.BaseTest;
+import org.tron.common.utils.JsonUtil;
+import org.tron.core.Constant;
+import org.tron.core.capsule.BytesCapsule;
+import org.tron.core.config.args.Args;
+
+
+public class NodePersistServiceTest extends BaseTest {
+
+  @Resource
+  private NodePersistService nodePersistService;
+
+  @BeforeClass
+  public static void init() {
+    Args.setParam(new String[] {"--output-directory", dbPath(), "--debug"},
+        Constant.TEST_CONF);
+  }
+
+  @Test
+  public void testDbRead() {
+    byte[] DB_KEY_PEERS = "peers".getBytes();
+    DBNode dbNode = new DBNode("localhost", 3306);
+    List<DBNode> dbNodeList = new ArrayList<>();
+    dbNodeList.add(dbNode);
+    DBNodes dbNodes = new DBNodes();
+    dbNodes.setNodes(dbNodeList);
+    chainBaseManager.getCommonStore().put(DB_KEY_PEERS, new BytesCapsule(
+        JsonUtil.obj2Json(dbNodes).getBytes()));
+
+    Assert.assertEquals(1, nodePersistService.dbRead().size());
+  }
+}

framework/src/test/java/org/tron/core/net/service/nodepersist/NodePersistServiceTest.java

@@ -167,7 +167,7 @@ node {
     # httpPBFTPort = 8565
     # maxBlockRange = 5000
     # maxSubTopics = 1000
-    # maxFilterNum = 50000
+    # maxBlockFilterNum = 30000
   }
 
 }