fix(net):modify BaseNet

Author: 317787106

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

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

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

@@ -103,9 +103,9 @@ public void run() {
       }
     });
     int tryTimes = 0;
-    while (++tryTimes < 100 && tronNetDelegate == null) {
-      Thread.sleep(3000);
-    }
+    do {
+      Thread.sleep(3000); //coverage consumerInvToSpread,consumerInvToFetch in AdvService.init
+    } while (++tryTimes < 100 && tronNetDelegate == null);
   }
 
   @After
@@ -115,7 +115,7 @@ public void destroy() {
     for (PeerConnection peer : peerConnections) {
       peer.getChannel().close();
     }
-
+    Args.clearParam();
     context.destroy();
     FileUtil.deleteDir(new File(dbPath));
   }

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

@@ -42,7 +42,7 @@ public void destroy() {
   public void testNoIpv4() throws Exception {
     TronNetService tronNetService = context.getBean(TronNetService.class);
     Method privateMethod = tronNetService.getClass()
-        .getDeclaredMethod("getConfig", P2pConfig.class);
+        .getDeclaredMethod("updateConfig", P2pConfig.class);
     privateMethod.setAccessible(true);
     P2pConfig config = new P2pConfig();
     config.setIp(null);

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

@@ -108,7 +108,7 @@ node {
   # 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
+  # if your node's highest block num is below than all your pees', try to acquire new connection, default false
   effectiveCheckEnable = false
 
   dns {