Merge pull request #2332 from tronprotocol/p2p_adv_t

xxo1shine · web-flow · commit bfa63f2e1ee9 · 2019-06-25T17:33:36.000+08:00
modify fastnode process block
diff --git a/src/main/java/org/tron/core/net/messagehandler/BlockMsgHandler.java b/src/main/java/org/tron/core/net/messagehandler/BlockMsgHandler.java
@@ -102,6 +102,7 @@ private void processBlock(PeerConnection peer, BlockCapsule block) throws P2pExc
 
     Item item = new Item(blockId, InventoryType.BLOCK);
     if (fastForward || peer.isFastForwardPeer()) {
+      peer.getAdvInvReceive().put(item, System.currentTimeMillis());
       advService.addInvToCache(item);
     }
 
@@ -112,7 +113,6 @@ private void processBlock(PeerConnection peer, BlockCapsule block) throws P2pExc
         return;
       }
       if (tronNetDelegate.validBlock(block)) {
-        peer.getAdvInvReceive().put(item, System.currentTimeMillis());
         advService.fastForward(new BlockMessage(block));
         tronNetDelegate.trustNode(peer);
       }

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ private void processBlock(PeerConnection peer, BlockCapsule block) throws P2pExc`
`102`	`102`
`103`	`103`	`Item item = new Item(blockId, InventoryType.BLOCK);`
`104`	`104`	`if (fastForward \|\| peer.isFastForwardPeer()) {`
	`105`	`+ peer.getAdvInvReceive().put(item, System.currentTimeMillis());`
`105`	`106`	`advService.addInvToCache(item);`
`106`	`107`	`}`
`107`	`108`
`@@ -112,7 +113,6 @@ private void processBlock(PeerConnection peer, BlockCapsule block) throws P2pExc`
`112`	`113`	`return;`
`113`	`114`	`}`
`114`	`115`	`if (tronNetDelegate.validBlock(block)) {`
`115`		`- peer.getAdvInvReceive().put(item, System.currentTimeMillis());`
`116`	`116`	`advService.fastForward(new BlockMessage(block));`
`117`	`117`	`tronNetDelegate.trustNode(peer);`
`118`	`118`	`}`