feat(net) : optimizing the sortPeers method

tronprotocol · Jun 21, 2024 · e8e61fe · e8e61fe
1 parent d383177
commit e8e61fe
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/framework/src/main/java/org/tron/core/net/peer/PeerManager.java b/framework/src/main/java/org/tron/core/net/peer/PeerManager.java
@@ -94,7 +94,11 @@ private static void remove(PeerConnection peerConnection) {
   }
 
   public static synchronized void sortPeers() {
-    peers.sort(Comparator.comparingDouble(c -> c.getChannel().getAvgLatency()));
+    try {
+      peers.sort(Comparator.comparingDouble(c -> c.getChannel().getAvgLatency()));
+    } catch (Exception e) {
+      logger.warn("Sort peers failed. {}", e.getMessage());
+    }
   }
 
   public static PeerConnection getPeerConnection(Channel channel) {

diff --git a/framework/src/test/java/org/tron/core/net/peer/PeerManagerTest.java b/framework/src/test/java/org/tron/core/net/peer/PeerManagerTest.java
@@ -135,4 +135,32 @@ public void testGetPeers() throws Exception {
     Assert.assertEquals(2, peers.size());
   }
 
+  @Test
+  public void testSortPeers() throws Exception {
+    PeerConnection p1 = new PeerConnection();
+    PeerConnection p2 = new PeerConnection();
+
+    List<PeerConnection> peers = new ArrayList<>();
+    peers.add(p1);
+    peers.add(p2);
+
+    Field field = PeerManager.class.getDeclaredField("peers");
+    field.setAccessible(true);
+    field.set(PeerManager.class, Collections.synchronizedList(peers));
+
+    PeerManager.sortPeers();
+
+    Channel c1 = new Channel();
+    c1.updateAvgLatency(100000L);
+    ReflectUtils.setFieldValue(p1, "channel", c1);
+
+    Channel c2 = new Channel();
+    c2.updateAvgLatency(1000L);
+    ReflectUtils.setFieldValue(p2, "channel", c2);
+
+    PeerManager.sortPeers();
+
+    Assert.assertEquals(PeerManager.getPeers().get(0), p2);
+  }
+
 }