optimize log and code

Author: olenheim

src/main/java/org/tron/core/net/node/NodeDelegateImpl.java

@@ -102,8 +102,7 @@ public synchronized LinkedList<Sha256Hash> handleBlock(BlockCapsule block, boole
 
   @Override
   public void handleTransaction(TransactionCapsule trx) throws BadTransactionException {
-    logger.info("handle transaction");
-
+    logger.debug("handle transaction");
     if (dbManager.getTransactionIdCache().getIfPresent(trx.getTransactionId()) != null) {
       logger.warn("This transaction has been processed");
       return;

src/main/java/org/tron/core/net/node/NodeImpl.java

@@ -90,20 +90,13 @@ public class NodeImpl extends PeerConnectionDelegate implements Node {
       .maximumSize(10).expireAfterWrite(60, TimeUnit.SECONDS)
       .recordStats().build();
 
-//  private Cache<Long, Long> fetchWaterLine = CacheBuilder.newBuilder()
-//      .expireAfterWrite(BLOCK_PRODUCED_INTERVAL / 1000 * MSG_CACHE_DURATION_IN_BLOCKS, TimeUnit.SECONDS)
-//      .recordStats().build();
-
   private SlidingWindowCounter fetchWaterLine =
-      new SlidingWindowCounter(BLOCK_PRODUCED_INTERVAL / 100 * MSG_CACHE_DURATION_IN_BLOCKS);
-
-
+      new SlidingWindowCounter(BLOCK_PRODUCED_INTERVAL * MSG_CACHE_DURATION_IN_BLOCKS / 100);
 
   private int maxTrxsSize = 1_000_000;
 
   private int maxTrxsCnt = 100;
 
-
   @Getter
   class PriorItem implements java.lang.Comparable<PriorItem> {
 
@@ -735,25 +728,10 @@ private void onHandleInventoryMessage(PeerConnection peer, InventoryMessage msg)
   }
 
   private boolean isFlooded() {
-//    try {
-//      long value = fetchWaterLine.get(Time.getCurrentMillis() / 1000, () -> 0L);
-//      fetchWaterLine.put(Time.getCurrentMillis() / 1000, value);
-//    } catch (ExecutionException e) {
-//      e.printStackTrace();
-//    }
     return fetchWaterLine.totalCount()
         > BLOCK_PRODUCED_INTERVAL * NET_MAX_TRX_PER_SECOND * MSG_CACHE_DURATION_IN_BLOCKS / 1000;
   }
 
-//  private void addWaterLine() {
-//    try {
-//      long value = fetchWaterLine.get(Time.getCurrentMillis() / 1000, () -> 0L);
-//      fetchWaterLine.put(Time.getCurrentMillis() / 1000, ++value);
-//    } catch (ExecutionException e) {
-//      e.printStackTrace();
-//    }
-//  }
-
   @Override
   public void syncFrom(Sha256Hash myHeadBlockHash) {
     try {
@@ -767,7 +745,6 @@ public void syncFrom(Sha256Hash myHeadBlockHash) {
     logger.info("wait end");
   }
 
-
   private void onHandleBlockMessage(PeerConnection peer, BlockMessage blkMsg) {
     Map<Item, Long> advObjWeRequested = peer.getAdvObjWeRequested();
     Map<BlockId, Long> syncBlockRequested = peer.getSyncBlockRequested();

src/main/java/org/tron/core/net/peer/PeerConnection.java

@@ -1,6 +1,5 @@
 package org.tron.core.net.peer;
 
-import static org.tron.core.config.Parameter.ChainConstant.BLOCK_PRODUCED_INTERVAL;
 import static org.tron.core.config.Parameter.NetConstants.MAX_INVENTORY_SIZE_IN_MINUTES;
 import static org.tron.core.config.Parameter.NetConstants.NET_MAX_TRX_PER_SECOND;
 
@@ -169,12 +168,7 @@ private void removeIterator(Iterator<Entry<Sha256Hash, Long>> iterator, long old
   }
 
   public boolean isAdvInvFull() {
-    if (advObjSpreadToUs.size() > MAX_INVENTORY_SIZE_IN_MINUTES * 60 * NET_MAX_TRX_PER_SECOND
-        + (MAX_INVENTORY_SIZE_IN_MINUTES + 1) * 60 / BLOCK_PRODUCED_INTERVAL) {
-      logger.info("adv is full!!!,  advObjSpreadToUs size:" + advObjSpreadToUs.size());
-      return true;
-    }
-    return false;
+   return advObjSpreadToUs.size() > MAX_INVENTORY_SIZE_IN_MINUTES * 60 * NET_MAX_TRX_PER_SECOND;
   }
 
   public boolean isBanned() {