Merge pull request #907 from tronprotocol/develop

merge from develop
tronprotocol · May 31, 2018 · 0f6a77d · 0f6a77d
2 parents 3d292ec + 28d733b
commit 0f6a77d
Show file tree

Hide file tree

Showing 8 changed files with 288 additions and 279 deletions.
diff --git a/src/main/java/org/tron/common/overlay/discover/NodeStatistics.java b/src/main/java/org/tron/common/overlay/discover/NodeStatistics.java
@@ -189,15 +189,6 @@ public boolean isReputationPenalized() {
     return false;
   }
 
-  public boolean isPenalized() {
-    return tronLastLocalDisconnectReason == ReasonCode.NULL_IDENTITY ||
-        tronLastRemoteDisconnectReason == ReasonCode.NULL_IDENTITY ||
-        tronLastLocalDisconnectReason == ReasonCode.BAD_PROTOCOL ||
-        tronLastRemoteDisconnectReason == ReasonCode.BAD_PROTOCOL ||
-        tronLastLocalDisconnectReason == ReasonCode.SYNC_FAIL ||
-        tronLastRemoteDisconnectReason == ReasonCode.SYNC_FAIL;
-  }
-
   public void nodeDisconnectedRemote(ReasonCode reason) {
     lastDisconnectedTime = System.currentTimeMillis();
     tronLastRemoteDisconnectReason = reason;