Merge pull request #1089 from tronprotocol/p2p_cfg

P2p: add active node cfg

Author: zhaohong

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

@@ -410,9 +410,9 @@ public static void setParam(final String[] args, final String confFileName) {
         config.hasPath("node.connection.timeout") ? config.getInt("node.connection.timeout") * 1000
             : 0;
 
-    INSTANCE.activeNodes = getNodes(config, "active.node");
+    INSTANCE.activeNodes = getNodes(config, "node.active");
 
-    INSTANCE.passiveNodes = getNodes(config, "passive.node");
+    INSTANCE.passiveNodes = getNodes(config, "node.passive");
 
     INSTANCE.nodeChannelReadTimeout =
         config.hasPath("node.channel.read.timeout") ? config.getInt("node.channel.read.timeout")

src/main/resources/config-beta.conf

@@ -66,6 +66,14 @@ node {
 
   maxActiveNodes = 30
 
+  active = [
+    "47.93.9.236:18888",
+    "47.93.33.201:18888",
+    "123.56.10.6:18888",
+    "39.107.80.135:18888",
+    "47.93.184.2:18888"
+  ]
+
   p2p {
     version = 102 # 47: testnet; 101: debug
   }
@@ -101,14 +109,6 @@ sync {
   node.count = 30
 }
 
-active.node = [
-   "47.93.9.236:18888",
-   "47.93.33.201:18888",
-   "123.56.10.6:18888",
-   "39.107.80.135:18888",
-   "47.93.184.2:18888"
-]
-
 seed.node = {
   # List of the seed nodes
   # Seed nodes are stable full nodes

src/main/resources/config.conf

@@ -91,6 +91,20 @@ node {
     version = 10000 # 10000: mainnet; 71: testnet
   }
 
+  active = [
+    # Active establish connection in any case
+    # Sample entries:
+    # "ip:port",
+    # "ip:port"
+  ]
+
+  passive = [
+    # Passive accept connection in any case
+    # Sample entries:
+    # "ip:port",
+    # "ip:port"
+  ]
+
   rpc {
     port = 50051
 
@@ -118,19 +132,7 @@ node {
 
 }
 
-active.node = [
-  # Active establish connection in any case
-  # Sample entries:
-  # "ip:port",
-  # "ip:port"
-]
 
-passive.node = [
-  # Passive accept connection in any case
-  # Sample entries:
-  # "ip:port",
-  # "ip:port"
-]
 
 seed.node = {
   # List of the seed nodes