Merge pull request #5256 from Vikingzzu/fix_refetch_block

fix(net): fix refetch block logic

Author: Vikingzzu

framework/src/main/java/org/tron/core/net/service/fetchblock/FetchBlockService.java

@@ -41,9 +41,6 @@ public class FetchBlockService {
 
   private final long fetchTimeOut = CommonParameter.getInstance().fetchBlockTimeout;
 
-  private static final int BLOCK_FETCH_TIME_OUT_LIMIT =
-      2 * Parameter.ChainConstant.BLOCK_PRODUCED_INTERVAL;
-
   private static final double BLOCK_FETCH_LEFT_TIME_PERCENT = 0.5;
 
   private final ScheduledExecutorService fetchBlockWorkerExecutor =
@@ -76,12 +73,9 @@ public void fetchBlock(List<Sha256Hash> sha256HashList, PeerConnection peer) {
     sha256HashList.stream().filter(sha256Hash -> new BlockCapsule.BlockId(sha256Hash).getNum()
         == chainBaseManager.getHeadBlockNum() + 1)
         .findFirst().ifPresent(sha256Hash -> {
-          if (System.currentTimeMillis() - chainBaseManager.getHeadBlockTimeStamp()
-              < BLOCK_FETCH_TIME_OUT_LIMIT) {
-            fetchBlockInfo = new FetchBlockInfo(sha256Hash, peer, System.currentTimeMillis());
-            logger.info("Set fetchBlockInfo, block: {}, peer: {}, time: {}", sha256Hash,
-                fetchBlockInfo.getPeer().getInetAddress(), fetchBlockInfo.getTime());
-          }
+          fetchBlockInfo = new FetchBlockInfo(sha256Hash, peer, System.currentTimeMillis());
+          logger.info("Set fetchBlockInfo, block: {}, peer: {}, time: {}", sha256Hash,
+              fetchBlockInfo.getPeer().getInetAddress(), fetchBlockInfo.getTime());
         });
   }
 
@@ -99,13 +93,6 @@ private void fetchBlockProcess(FetchBlockInfo fetchBlock) {
     if (null == fetchBlock) {
       return;
     }
-    if (System.currentTimeMillis() - chainBaseManager.getHeadBlockTimeStamp()
-        >= BLOCK_FETCH_TIME_OUT_LIMIT) {
-      this.fetchBlockInfo = null;
-      logger.info("Clear fetchBlockInfo due to {} ms past head block time",
-              BLOCK_FETCH_TIME_OUT_LIMIT);
-      return;
-    }
     Item item = new Item(fetchBlock.getHash(), InventoryType.BLOCK);
     Optional<PeerConnection> optionalPeerConnection = tronNetDelegate.getActivePeer().stream()
         .filter(PeerConnection::isIdle)