Merge pull request #949 from tronprotocol/update_master_seed

Update master seed

Author: renchenchang

src/main/java/org/tron/common/overlay/server/SyncPool.java

@@ -80,16 +80,13 @@ public class SyncPool {
 
   private PeerClient peerClient;
 
-  @Autowired
-  public SyncPool(PeerClient peerClient) {
-    this.peerClient = peerClient;
-  }
-
   public void init(PeerConnectionDelegate peerDel) {
     this.peerDel = peerDel;
 
     channelManager = ctx.getBean(ChannelManager.class);
 
+    peerClient = ctx.getBean(PeerClient.class);
+
     poolLoopExecutor.scheduleWithFixedDelay(() -> {
       try {
         fillUp();

src/main/resources/config.conf

@@ -125,17 +125,16 @@ seed.node = {
   #   "ip:port"
   # ]
   ip.list = [
-    "47.254.16.55:18888",
-    "47.254.18.49:18888",
+    "47.91.246.252:18888",
+    "39.106.220.120:18888",
+    "35.169.113.187:18888",
+    "18.208.116.213:18888",
     "18.188.111.53:18888",
+    "52.14.211.18:18888",
     "54.219.41.56:18888",
-    "35.169.113.187:18888",
+    "13.57.78.225:18888",
     "34.214.241.188:18888",
-    "47.254.146.147:18888",
-    "47.254.144.25:18888",
-    "47.91.246.252:18888",
-    "47.91.216.69:18888",
-    "39.106.220.120:18888"
+    "54.200.48.177:18888"
   ]
 }
 

src/test/java/org/tron/core/net/node/NodeImplTest.java

@@ -192,7 +192,7 @@ public void testDisconnectInactive() {
     peer3.setSyncBlockRequested(syncBlockRequested3);
 
     // fetch failed
-    SyncPool pool = new SyncPool(new PeerClient());
+    SyncPool pool = new SyncPool();
     pool.addActivePeers(peer1);
     nodeImpl.setPool(pool);
     try {
@@ -203,7 +203,7 @@ public void testDisconnectInactive() {
     }
 
     // sync failed
-    pool = new SyncPool(new PeerClient());
+    pool = new SyncPool();
     pool.addActivePeers(peer2);
     nodeImpl.setPool(pool);
     try {
@@ -214,7 +214,7 @@ public void testDisconnectInactive() {
     }
 
     // should not disconnect
-    pool = new SyncPool(new PeerClient());
+    pool = new SyncPool();
     pool.addActivePeers(peer3);
     nodeImpl.setPool(pool);
     try {