feat(config):add test case

Author: jwrct

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

@@ -618,6 +618,10 @@ public class CommonParameter {
   @Setter
   public boolean dynamicConfigEnable;
 
+  @Getter
+  @Setter
+  public long dynamicConfigCheckInterval;
+
   private static double calcMaxTimeRatio() {
     //return max(2.0, min(5.0, 5 * 4.0 / max(Runtime.getRuntime().availableProcessors(), 1)));
     return 5.0;

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

@@ -344,5 +344,6 @@ public class Constant {
 
   public static final String BLOCK_CACHE_TIMEOUT = "node.blockCacheTimeout";
 
-  public static final String DYNAMIC_CONFIG_ENABLE = "dynamicConfigEnable";
+  public static final String DYNAMIC_CONFIG_ENABLE = "node.dynamicConfig.enable";
+  public static final String DYNAMIC_CONFIG_CHECK_INTERVAL = "node.dynamicConfig.checkInterval";
 }

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

@@ -223,6 +223,7 @@ public static void clearParam() {
     PARAMETER.memoFee = 0;
     PARAMETER.p2pDisable = false;
     PARAMETER.dynamicConfigEnable = false;
+    PARAMETER.dynamicConfigCheckInterval = 600;
   }
 
   /**
@@ -1126,6 +1127,15 @@ public static void setParam(final String[] args, final String confFileName) {
 
     PARAMETER.dynamicConfigEnable = config.hasPath(Constant.DYNAMIC_CONFIG_ENABLE)
         && config.getBoolean(Constant.DYNAMIC_CONFIG_ENABLE);
+    if (config.hasPath(Constant.DYNAMIC_CONFIG_CHECK_INTERVAL)) {
+      PARAMETER.dynamicConfigCheckInterval
+          = config.getLong(Constant.DYNAMIC_CONFIG_CHECK_INTERVAL);
+      if (PARAMETER.dynamicConfigCheckInterval <= 0) {
+        PARAMETER.dynamicConfigCheckInterval = 600;
+      }
+    } else {
+      PARAMETER.dynamicConfigCheckInterval = 600;
+    }
 
     logConfig();
   }

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

@@ -31,19 +31,19 @@ public class DynamicArgs {
   public void init() {
     if (parameter.isDynamicConfigEnable()) {
       File config = getConfigFile();
-      if (config != null) {
-        lastModified = config.lastModified();
-      } else {
+      if (config == null) {
         return;
       }
+      lastModified = config.lastModified();
       logger.info("Start the dynamic loading configuration service");
+      long checkInterval = parameter.getDynamicConfigCheckInterval();
       reloadExecutor.scheduleWithFixedDelay(() -> {
         try {
           run();
         } catch (Exception e) {
           logger.error("Exception caught when reloading configuration", e);
         }
-      }, 100, 10, TimeUnit.SECONDS);
+      }, 10, checkInterval, TimeUnit.SECONDS);
     }
   }
 
@@ -108,7 +108,7 @@ private void updateTrustNodes(Config config) {
   }
 
   public void close() {
-    logger.info("Closing the dynamic loading configuration service ...");
+    logger.info("Closing the dynamic loading configuration service");
     reloadExecutor.shutdown();
   }
 }

framework/src/test/java/org/tron/core/config/args/DynamicArgsTest.java

@@ -11,8 +11,8 @@
 import org.tron.common.utils.ReflectUtils;
 import org.tron.core.Constant;
 import org.tron.core.config.DefaultConfig;
-//import org.tron.core.net.TronNetService;
-//import org.tron.p2p.P2pConfig;
+import org.tron.core.net.TronNetService;
+import org.tron.p2p.P2pConfig;
 
 public class DynamicArgsTest {
   protected TronApplicationContext context;
@@ -39,18 +39,31 @@ public void destroy() {
   public void get() {
     CommonParameter parameter = Args.getInstance();
     Assert.assertFalse(parameter.isDynamicConfigEnable());
-
+    Assert.assertEquals(600, parameter.getDynamicConfigCheckInterval());
   }
 
   @Test
   public void start() {
     dynamicArgs.init();
     Assert.assertEquals(0, (long) ReflectUtils.getFieldObject(dynamicArgs, "lastModified"));
 
-    dynamicArgs.run();
-//    TronNetService tronNetService = context.getBean(TronNetService.class);
-//    ReflectUtils.setFieldValue(tronNetService, "p2pConfig", new P2pConfig());
-//    dynamicArgs.reload();
+    TronNetService tronNetService = context.getBean(TronNetService.class);
+    ReflectUtils.setFieldValue(tronNetService, "p2pConfig", new P2pConfig());
+    File config = new File(Constant.TESTNET_CONF);
+    if (!config.exists()) {
+      try {
+        config.createNewFile();
+      } catch (Exception e) {
+        return;
+      }
+      dynamicArgs.run();
+      try {
+        config.delete();
+      } catch (Exception e) {
+        return;
+      }
+    }
+
     dynamicArgs.close();
   }
 }

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

@@ -286,4 +286,6 @@ vm = {
 }
 committee = {
   allowCreationOfContracts = 1  //mainnet:0 (reset by committee),test:1
-}
+}
+
+node.dynamicConfig.checkInterval = 0