fix(net): stable test case; add parameters in config

Author: 317787106

framework/src/main/java/org/tron/core/net/TronNetService.java

@@ -82,7 +82,8 @@ private static void setP2pConfig(P2pConfig config) {
   public void start() {
     try {
       init = true;
-      setP2pConfig(getConfig());
+      P2pConfig config = new P2pConfig();
+      setP2pConfig(getConfig(config));
       p2pService.start(p2pConfig);
       p2pService.register(p2pEventHandler);
       advService.init();
@@ -147,11 +148,10 @@ public static boolean hasIpv4Stack(Set<String> ipSet) {
     return false;
   }
 
-  private P2pConfig getConfig() {
+  private P2pConfig getConfig(P2pConfig config) {
     List<InetSocketAddress> seeds = parameter.getSeedNode().getAddressList();
     seeds.addAll(nodePersistService.dbRead());
     logger.debug("Seed InetSocketAddress: {}", seeds);
-    P2pConfig config = new P2pConfig();
     config.getSeedNodes().addAll(seeds);
     config.getActiveNodes().addAll(parameter.getActiveNodes());
     config.getTrustNodes().addAll(parameter.getPassiveNodes());

framework/src/main/resources/config.conf

@@ -202,6 +202,19 @@ node {
     solidityPort = 8091
   }
 
+  # use your ipv6 address for node discovery and tcp connection, default false
+  enableIpv6 = false
+
+  # if your node's highest block num is below than all your pees', try to acquire new connection. default false
+  effectiveCheckEnable = false
+
+  dns {
+    # dns urls to get nodes, url format tree://{pubkey}@{domain}, default empty
+    treeUrls = [
+      #"tree://APFGGTFOBVE2ZNAB3CSMNNX6RRK3ODIRLP2AA5U4YFAA6MSYZUYTQ@nodes1.example.org",
+    ]
+  }
+
   rpc {
     port = 50051
     #solidityPort = 50061

framework/src/test/java/org/tron/common/config/args/ArgsTest.java

@@ -11,16 +11,18 @@
 
 public class ArgsTest {
 
+  private static final String dbPath = "output_arg_test";
+
   @Before
   public void init() {
-    Args.setParam(new String[]{"--output-directory", "output-directory", "--p2p-disable", "true",
+    Args.setParam(new String[]{"--output-directory", dbPath, "--p2p-disable", "true",
         "--debug"}, Constant.TEST_CONF);
   }
 
   @After
   public void destroy() {
     Args.clearParam();
-    FileUtil.deleteDir(new File("output-directory"));
+    FileUtil.deleteDir(new File(dbPath));
   }
 
   @Test

framework/src/test/java/org/tron/core/actuator/utils/ProposalUtilTest.java

@@ -357,6 +357,10 @@ public void validateCheck() {
       Assert.assertEquals("Bad chain parameter value, valid range is [0, 1_000_000_000_000L]",
           e.getMessage());
     }
+
+    forkUtils.getManager().getDynamicPropertiesStore()
+        .statsByVersion(ForkBlockVersionEnum.ENERGY_LIMIT.getValue(), stats);
+    forkUtils.reset();
   }
 
   @Test

framework/src/test/java/org/tron/core/db/ManagerTest.java

@@ -226,6 +226,13 @@ public void pushBlock() {
       }
     }
 
+    try {
+      chainManager.getBlockIdByNum(-1);
+      Assert.fail();
+    } catch (ItemNotFoundException e) {
+      Assert.assertTrue(true);
+    }
+
     Assert.assertTrue("hasBlocks is error", chainManager.hasBlocks());
   }
 

framework/src/test/java/org/tron/core/net/MessageTest.java

@@ -107,6 +107,11 @@ public Class<?> getAnswerMessage() {
     messageStatistics.addTcpOutMessage(message4);
     messageStatistics.addTcpInMessage(message5);
     messageStatistics.addTcpOutMessage(message5);
+    try {
+      Thread.sleep(2000);// so that gap > 1 in MessageCount.update method
+    } catch (InterruptedException e) {
+      //ignore
+    }
     messageStatistics.addTcpInMessage(message6);
     messageStatistics.addTcpOutMessage(message6);
     messageStatistics.addTcpInMessage(message7);

framework/src/test/java/org/tron/core/net/services/EffectiveCheckServiceTest.java

@@ -1,6 +1,7 @@
 package org.tron.core.net.services;
 
 import java.io.File;
+import java.lang.reflect.Method;
 import java.net.InetSocketAddress;
 import org.junit.After;
 import org.junit.Assert;
@@ -37,6 +38,18 @@ public void destroy() {
     FileUtil.deleteDir(new File(dbPath));
   }
 
+  @Test
+  public void testNoIpv4() throws Exception {
+    TronNetService tronNetService = context.getBean(TronNetService.class);
+    Method privateMethod = tronNetService.getClass()
+        .getDeclaredMethod("getConfig", P2pConfig.class);
+    privateMethod.setAccessible(true);
+    P2pConfig config = new P2pConfig();
+    config.setIp(null);
+    P2pConfig newConfig = (P2pConfig) privateMethod.invoke(tronNetService, config);
+    Assert.assertNotNull(newConfig.getIp());
+  }
+
   @Test
   public void testFind() {
     TronNetService tronNetService = context.getBean(TronNetService.class);

framework/src/test/resources/config-test.conf

@@ -105,8 +105,12 @@ node {
       solidityPort = 8091
   }
 
+  # use your ipv6 address for node discovery and tcp connection, default false
   enableIpv6 = false
 
+  # if your node's highest block num is below than all your pees', try to acquire new connection
+  effectiveCheckEnable = false
+
   dns {
     # dns urls to get nodes, url format tree://{pubkey}@{domain}, default empty
     treeUrls = [