add updateLastActiveTime

Author: 317787106

framework/src/main/java/org/tron/core/net/P2pEventHandlerImpl.java

@@ -185,11 +185,9 @@ private void processMessage(PeerConnection peer, byte[] data) {
           break;
         case SYNC_BLOCK_CHAIN:
           syncBlockChainMsgHandler.processMessage(peer, msg);
-          peer.setLastActiveTime(System.currentTimeMillis());
           break;
         case BLOCK_CHAIN_INVENTORY:
           chainInventoryMsgHandler.processMessage(peer, msg);
-          peer.setLastActiveTime(System.currentTimeMillis());
           break;
         case INVENTORY:
           inventoryMsgHandler.processMessage(peer, msg);
@@ -199,7 +197,6 @@ private void processMessage(PeerConnection peer, byte[] data) {
           break;
         case BLOCK:
           blockMsgHandler.processMessage(peer, msg);
-          peer.setLastActiveTime(System.currentTimeMillis());
           break;
         case TRXS:
           transactionsMsgHandler.processMessage(peer, msg);
@@ -210,6 +207,7 @@ private void processMessage(PeerConnection peer, byte[] data) {
         default:
           throw new P2pException(P2pException.TypeEnum.NO_SUCH_MESSAGE, msg.getType().toString());
       }
+      updateLastActiveTime(peer, msg);
     } catch (Exception e) {
       processException(peer, msg, e);
     } finally {
@@ -225,6 +223,27 @@ private void processMessage(PeerConnection peer, byte[] data) {
     }
   }
 
+  private void updateLastActiveTime(PeerConnection peer, TronMessage msg) {
+    MessageTypes type = msg.getType();
+
+    boolean flag = false;
+    switch (type) {
+      case SYNC_BLOCK_CHAIN:
+      case BLOCK_CHAIN_INVENTORY:
+      case BLOCK:
+        flag = true;
+        break;
+      case FETCH_INV_DATA:
+        flag = ((FetchInvDataMessage) msg).getInventoryType().equals(InventoryType.BLOCK);
+        break;
+      default:
+        break;
+    }
+    if (flag) {
+      peer.setLastActiveTime(System.currentTimeMillis());
+    }
+  }
+
   private void processException(PeerConnection peer, TronMessage msg, Exception ex) {
     Protocol.ReasonCode code;
 

framework/src/main/java/org/tron/core/net/messagehandler/FetchInvDataMsgHandler.java

@@ -171,7 +171,6 @@ private void check(PeerConnection peer, FetchInvDataMessage fetchInvDataMsg) thr
           peer.getSyncBlockIdCache().put(hash, System.currentTimeMillis());
         }
       }
-      peer.setLastActiveTime(System.currentTimeMillis());
     }
   }
 

framework/src/test/java/org/tron/core/net/P2pEventHandlerImplTest.java

@@ -12,10 +12,13 @@
 import org.tron.common.utils.Sha256Hash;
 import org.tron.core.Constant;
 import org.tron.core.config.args.Args;
+import org.tron.core.net.message.TronMessage;
+import org.tron.core.net.message.adv.FetchInvDataMessage;
 import org.tron.core.net.message.adv.InventoryMessage;
 import org.tron.core.net.peer.PeerConnection;
 import org.tron.core.net.service.statistics.PeerStatistics;
 import org.tron.protos.Protocol;
+import org.tron.protos.Protocol.Inventory.InventoryType;
 
 public class P2pEventHandlerImplTest {
 
@@ -108,4 +111,22 @@ public void testProcessInventoryMessage() throws Exception {
     Assert.assertEquals(300, count);
 
   }
+
+  @Test
+  public void testUpdateLastActiveTime() throws Exception {
+    String[] a = new String[0];
+    Args.setParam(a, Constant.TESTNET_CONF);
+
+    PeerConnection peer = new PeerConnection();
+    P2pEventHandlerImpl p2pEventHandler = new P2pEventHandlerImpl();
+
+    Method method = p2pEventHandler.getClass()
+        .getDeclaredMethod("updateLastActiveTime", PeerConnection.class, TronMessage.class);
+    method.setAccessible(true);
+
+    long t1 = System.currentTimeMillis();
+    FetchInvDataMessage message = new FetchInvDataMessage(new ArrayList<>(), InventoryType.BLOCK);
+    method.invoke(p2pEventHandler, peer, message);
+    Assert.assertTrue(peer.getLastActiveTime() >= t1);
+  }
 }