Merge pull request #6183 from fyyhtx/sync_update

feat(net): improve synchronization efficiency

Author: CodeNinjaEvan

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

@@ -983,7 +983,7 @@ public static void setParam(final Config config) {
     PARAMETER.fastForwardNodes = getInetSocketAddress(config, Constant.NODE_FAST_FORWARD, true);
 
     PARAMETER.maxFastForwardNum = config.hasPath(Constant.NODE_MAX_FAST_FORWARD_NUM) ? config
-            .getInt(Constant.NODE_MAX_FAST_FORWARD_NUM) : 3;
+            .getInt(Constant.NODE_MAX_FAST_FORWARD_NUM) : 4;
     if (PARAMETER.maxFastForwardNum > MAX_ACTIVE_WITNESS_NUM) {
       PARAMETER.maxFastForwardNum = MAX_ACTIVE_WITNESS_NUM;
     }

framework/src/main/java/org/tron/core/net/service/sync/SyncService.java

@@ -90,7 +90,7 @@ public void init() {
       } catch (Exception e) {
         logger.error("Handle sync block error", e);
       }
-    }, 10, 1, TimeUnit.SECONDS);
+    }, 10000, 100, TimeUnit.MILLISECONDS);
   }
 
   public void close() {

framework/src/test/java/org/tron/common/config/args/ArgsTest.java

@@ -36,7 +36,7 @@ public void testConfig() {
     Args.logConfig();
     Assert.assertEquals(Args.getInstance().getMaxTransactionPendingSize(), 2000);
     Assert.assertEquals(Args.getInstance().getPendingTransactionTimeout(), 60_000);
-    Assert.assertEquals(Args.getInstance().getMaxFastForwardNum(), 3);
+    Assert.assertEquals(Args.getInstance().getMaxFastForwardNum(), 4);
     Assert.assertEquals(Args.getInstance().getBlockCacheTimeout(), 60);
     Assert.assertEquals(Args.getInstance().isNodeDetectEnable(), false);
     Assert.assertFalse(Args.getInstance().isNodeEffectiveCheckEnable());

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

@@ -85,9 +85,11 @@ public void testStartSync() {
 
       peer.setChannel(c1);
 
+      ReflectUtils.setFieldValue(peer, "tronState", TronState.SYNCING);
+
       service.startSync(peer);
 
-      ReflectUtils.setFieldValue(peer, "tronState", TronState.SYNCING);
+      ReflectUtils.setFieldValue(peer, "tronState", TronState.INIT);
 
       service.startSync(peer);
     } catch (Exception e) {