move the parameters in the configuration file

sean-liu55 · sean-liu55 · commit e746e63fbbdb · 2018-04-24T18:34:53.000+08:00
diff --git a/src/main/java/org/tron/core/config/args/Args.java b/src/main/java/org/tron/core/config/args/Args.java
@@ -158,6 +158,14 @@ public class Args {
   //If you are running a solidity node for java tron, this flag is set to true
   private boolean solidityNode = false;
 
+  @Getter
+  @Setter
+  private int rpcPort;
+
+  @Getter
+  @Setter
+  private long maintenanceTimeInterval; // (ms)
+
   @Getter
   @Setter
   @Parameter(names = {"--trust-node"}, description = "Trust node addr")
@@ -191,6 +199,8 @@ public static void clearParam() {
     INSTANCE.nodeP2pPingInterval = 0L;
     INSTANCE.syncNodeCount = 0;
     INSTANCE.nodeP2pVersion = 0;
+    INSTANCE.rpcPort = 0;
+    INSTANCE.maintenanceTimeInterval = 0;
     INSTANCE.p2pNodeId = "";
     INSTANCE.solidityNode = false;
     INSTANCE.trustNodeAddr = "";
@@ -299,6 +309,13 @@ public static void setParam(final String[] args, final String confFileName) {
     INSTANCE.nodeP2pVersion =
         config.hasPath("node.p2p.version") ? config.getInt("node.p2p.version") : 0;
 
+    INSTANCE.rpcPort =
+        config.hasPath("node.rpc.port") ? config.getInt("node.rpc.port") : 50051;
+
+    INSTANCE.maintenanceTimeInterval =
+        config.hasPath("block.maintenanceTimeInterval") ? config
+            .getInt("block.maintenanceTimeInterval") : 21600000L;
+
     if (StringUtils.isEmpty(INSTANCE.trustNodeAddr)) {
       INSTANCE.trustNodeAddr = config.hasPath("node.trustNode") ? config.getString("node.trustNode") : null;
     }
diff --git a/src/main/java/org/tron/core/db/DynamicPropertiesStore.java b/src/main/java/org/tron/core/db/DynamicPropertiesStore.java
@@ -18,7 +18,8 @@
 @Component
 public class DynamicPropertiesStore extends TronStoreWithRevoking<BytesCapsule> {
 
-  private static final long MAINTENANCE_TIME_INTERVAL = 24 * 3600 * 1000;// (ms)
+  private static final long MAINTENANCE_TIME_INTERVAL = Args.getInstance()
+      .getMaintenanceTimeInterval();
   private static final long MAINTENANCE_SKIP_SLOTS = 2;
   private static final int SINGLE_REPEAT = 1;
 
diff --git a/src/main/java/org/tron/core/services/RpcApiService.java b/src/main/java/org/tron/core/services/RpcApiService.java
@@ -61,7 +61,7 @@
 @Slf4j
 public class RpcApiService implements Service {
 
-  private int port = 50051;
+  private int port = Args.getInstance().getRpcPort();
   private Server apiServer;
   private Application app;
   private ApplicationContext ctx;
diff --git a/src/main/resources/config.conf b/src/main/resources/config.conf
@@ -20,6 +20,7 @@ node {
   # trustNode = "ip:port"
 
   listen.port = 18888
+  rpc.port = 50051
 
   connection.timeout = 2
 
@@ -35,7 +36,7 @@ node {
   minParticipationRate = 33
 
   p2p {
-    version = 58 # 58: testnet; 101: debug
+    version = 5800 # 58: testnet; 101: debug
   }
 
 }
@@ -171,4 +172,5 @@ localwitness = [
 
 block = {
   needSyncCheck = true # first node : false, other : true
+  maintenanceTimeInterval = 21600000 //1day: 86400000(ms), 6 hour
 }

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ node {`
`20`	`20`	`# trustNode = "ip:port"`
`21`	`21`
`22`	`22`	`listen.port = 18888`
	`23`	`+ rpc.port = 50051`
`23`	`24`
`24`	`25`	`connection.timeout = 2`
`25`	`26`
`@@ -35,7 +36,7 @@ node {`
`35`	`36`	`minParticipationRate = 33`
`36`	`37`
`37`	`38`	`p2p {`
`38`		`- version = 58 # 58: testnet; 101: debug`
	`39`	`+ version = 5800 # 58: testnet; 101: debug`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`}`
`@@ -171,4 +172,5 @@ localwitness = [`
`171`	`172`
`172`	`173`	`block = {`
`173`	`174`	`needSyncCheck = true # first node : false, other : true`
	`175`	`+ maintenanceTimeInterval = 21600000 //1day: 86400000(ms), 6 hour`
`174`	`176`	`}`