fix conflict

Author: lvs007

build.gradle

@@ -153,6 +153,7 @@ task lint(type: Checkstyle) {
     source 'src'
     include '**/*.java'
     exclude 'main/gen/**'
+    exclude 'test/**'
     // empty classpath
     classpath = files()
     //Failing the build
@@ -271,4 +272,4 @@ def binaryRelease(taskName, jarName, mainClass) {
 artifacts {
     archives(binaryRelease('buildSolidityNodeJar', 'SolidityNode', 'org.tron.program.SolidityNode'),
             binaryRelease('buildFullNodeJar', 'FullNode', 'org.tron.program.FullNode'))
-}
+}

src/main/java/org/tron/common/application/ApplicationImpl.java

@@ -117,7 +117,7 @@ private void closeConnection() {
     try {
       p2pNode.close();
     } catch (Exception e) {
-      System.err.println("faild to close p2pNode. " + e);
+      System.err.println("failed to close p2pNode. " + e);
     } finally {
       System.err.println("******** end to shutdown connection ********");
     }

src/main/java/org/tron/common/overlay/discover/NodeHandler.java

@@ -80,14 +80,13 @@ public enum State {
   }
 
   Node node;
-  NodeManager nodeManager;
-  private NodeStatistics nodeStatistics;
-
   State state;
-  boolean waitForPong = false;
-  long pingSent;
-  int pingTrials = 3;
-  NodeHandler replaceCandidate;
+  private NodeManager nodeManager;
+  private NodeStatistics nodeStatistics;
+  private NodeHandler replaceCandidate;
+  private volatile boolean waitForPong = false;
+  private volatile int pingTrials = 3;
+  private long pingSent;
 
   public NodeHandler(Node node, NodeManager nodeManager) {
     this.node = node;
@@ -175,7 +174,9 @@ void handlePing(PingMessage msg) {
     if (!nodeManager.table.getNode().equals(node)) {
       sendPong();
     }
-    if (state.equals(State.NonActive) || state.equals(State.Dead)) {
+    if (msg.getVersion() != Args.getInstance().getNodeP2pVersion()){
+      changeState(State.NonActive);
+    }else if (state.equals(State.NonActive) || state.equals(State.Dead)) {
       changeState(State.Discovered);
     }
   }
@@ -228,7 +229,7 @@ void handleTimedOut() {
   }
 
   void sendPing() {
-    Message ping = new PingMessage(nodeManager.table.getNode(), getNode());
+    Message ping = new PingMessage(nodeManager.getPublicHomeNode(), getNode());
     waitForPong = true;
     pingSent = System.currentTimeMillis();
     sendMessage(ping);
@@ -262,7 +263,7 @@ void sendNeighbours(List<Node> neighbours) {
   }
 
   void sendFindNode(byte[] target) {
-    Message findNode = new FindNodeMessage(node, target);
+    Message findNode = new FindNodeMessage(nodeManager.getPublicHomeNode(), target);
     sendMessage(findNode);
     getNodeStatistics().discoverOutFind.add();
   }

src/main/java/org/tron/common/overlay/discover/NodeManager.java

@@ -216,7 +216,7 @@ private void trimTable() {
     }
   }
 
-  boolean hasNodeHandler(Node n) {
+  public boolean hasNodeHandler(Node n) {
     return nodeHandlerMap.containsKey(getKey(n));
   }
 

src/main/java/org/tron/common/overlay/discover/NodeStatistics.java

@@ -93,11 +93,12 @@ private int getSessionFairReputation() {
     int discoverReput = 0;
 
     discoverReput +=
-        min(discoverInPong.get(), 1) * (discoverOutPing.get() == discoverInPong.get() ? 51 : 1);
-    discoverReput += min(discoverInNeighbours.get(), 10) * 10;
-    discoverReput += min(discoverInFind.get(), 50);
+        min(discoverInPong.get(), 1) * (discoverOutPing.get() == discoverInPong.get() ? 50 : 1);
 
-    //discoverReput += 20 / (min((int)discoverMessageLatency.getAvrg(), 1) / 100);
+    discoverReput +=
+        min(discoverInNeighbours.get(), 1) * (discoverOutFind.get() == discoverInNeighbours.get() ? 50 : 1);
+
+    discoverReput += (int)discoverMessageLatency.getAvrg() == 0 ? 0 : 1000 / discoverMessageLatency.getAvrg();
 
     int reput = 0;
     reput += p2pHandShake.get() > 0 ? 20 : 0;
@@ -273,7 +274,7 @@ public double getSum() {
     }
 
     public double getAvrg() {
-      return getSum() / getCount();
+      return count == 0 ? 0 : sum / count;
     }
 
     public String getName() {

src/main/java/org/tron/common/overlay/discover/message/FindNodeMessage.java

@@ -14,13 +14,9 @@ public class FindNodeMessage extends Message {
 
   private Discover.FindNeighbours findNeighbours;
 
-  public FindNodeMessage(byte[] data) {
+  public FindNodeMessage(byte[] data) throws Exception{
     super(Message.FINE_PEERS, data);
-    try {
-      this.findNeighbours = Discover.FindNeighbours.parseFrom(data);
-    } catch (InvalidProtocolBufferException e) {
-      logger.debug(e.getMessage(), e);
-    }
+    this.findNeighbours = Discover.FindNeighbours.parseFrom(data);
   }
 
   public FindNodeMessage(Node from, byte[] targetId) {

src/main/java/org/tron/common/overlay/discover/message/NeighborsMessage.java

@@ -17,13 +17,9 @@ public class NeighborsMessage extends Message {
 
   private Discover.Neighbours neighbours;
 
-  public NeighborsMessage(byte[] data) {
+  public NeighborsMessage(byte[] data) throws Exception{
     super(Message.GET_PEERS, data);
-    try {
-      this.neighbours = Discover.Neighbours.parseFrom(data);
-    } catch (InvalidProtocolBufferException e) {
-      logger.debug(e.getMessage(), e);
-    }
+    this.neighbours = Discover.Neighbours.parseFrom(data);
   }
 
   public NeighborsMessage(Node from, List<Node> neighbours) {

src/main/java/org/tron/common/overlay/discover/message/PingMessage.java

@@ -14,13 +14,9 @@ public class PingMessage extends Message {
 
   private Discover.PingMessage pingMessage;
 
-  public PingMessage(byte[] data) {
+  public PingMessage(byte[] data) throws Exception{
     super(Message.PING, data);
-    try {
-      this.pingMessage = Discover.PingMessage.parseFrom(data);
-    } catch (InvalidProtocolBufferException e) {
-      logger.debug(e.getMessage(), e);
-    }
+    this.pingMessage = Discover.PingMessage.parseFrom(data);
   }
 
   public PingMessage(Node from, Node to) {
@@ -44,6 +40,10 @@ public PingMessage(Node from, Node to) {
     this.data = this.pingMessage.toByteArray();
   }
 
+  public int getVersion(){
+    return this.pingMessage.getVersion();
+  }
+
   public Node getFrom() {
     Endpoint from = this.pingMessage.getFrom();
     Node node = new Node(from.getNodeId().toByteArray(),

src/main/java/org/tron/common/overlay/discover/message/PongMessage.java

@@ -14,13 +14,9 @@ public class PongMessage extends Message {
 
   private Discover.PongMessage pongMessage;
 
-  public PongMessage(byte[] data) {
+  public PongMessage(byte[] data) throws Exception{
     super(Message.PONG, data);
-    try {
-      this.pongMessage = Discover.PongMessage.parseFrom(data);
-    } catch (InvalidProtocolBufferException e) {
-      logger.debug(e.getMessage(), e);
-    }
+    this.pongMessage = Discover.PongMessage.parseFrom(data);
   }
 
   public PongMessage(Node from) {

src/main/java/org/tron/common/overlay/server/SyncPool.java

@@ -51,7 +51,7 @@ public class SyncPool {
   public static final Logger logger = LoggerFactory.getLogger("SyncPool");
 
   private static final long WORKER_TIMEOUT = 16;
-  private static final double fator = 0.4;
+  private static final double factor = 0.4;
 
   private final List<PeerConnection> activePeers = Collections.synchronizedList(new ArrayList<PeerConnection>());
   private final AtomicInteger passivePeersCount = new AtomicInteger(0);
@@ -106,7 +106,7 @@ public void init(PeerConnectionDelegate peerDel) {
   }
 
   private void fillUp() {
-    int lackSize = (int) (maxActiveNodes * fator) - activePeers.size();
+    int lackSize = (int) (maxActiveNodes * factor) - activePeers.size();
     if(lackSize <= 0) return;
 
     final Set<String> nodesInUse = channelManager.nodesInUse();