Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-03 14:07:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor simplifications.

Browse Source
This commit is contained in:
Mike Hearn
2012-12-25 01:23:16 +00:00
parent ea3fca970c
commit 3197be51ea
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/test/java/com/google/bitcoin/core/PeerGroupTest.java
View File

@@ -405,7 +405,7 @@ public class PeerGroupTest extends TestWithNetworkConnections {
} }
@Test @Test
public void commonChainHeights() throws Exception { public void downloadPeerSelection() throws Exception {
peerGroup.startAndWait(); peerGroup.startAndWait();
VersionMessage versionMessage2 = new VersionMessage(params, 2); VersionMessage versionMessage2 = new VersionMessage(params, 2);
VersionMessage versionMessage3 = new VersionMessage(params, 3); VersionMessage versionMessage3 = new VersionMessage(params, 3);
@@ -413,7 +413,7 @@ public class PeerGroupTest extends TestWithNetworkConnections {
Peer a = PeerGroup.peerFromChannel(connectPeer(1, versionMessage2)); Peer a = PeerGroup.peerFromChannel(connectPeer(1, versionMessage2));
assertEquals(2, peerGroup.getMostCommonChainHeight()); assertEquals(2, peerGroup.getMostCommonChainHeight());
assertEquals(a, peerGroup.getDownloadPeer()); assertEquals(a, peerGroup.getDownloadPeer());
Peer b = PeerGroup.peerFromChannel(connectPeer(2, versionMessage2)); PeerGroup.peerFromChannel(connectPeer(2, versionMessage2));
assertEquals(2, peerGroup.getMostCommonChainHeight()); assertEquals(2, peerGroup.getMostCommonChainHeight());
assertEquals(a, peerGroup.getDownloadPeer()); // No change. assertEquals(a, peerGroup.getDownloadPeer()); // No change.
Peer c = PeerGroup.peerFromChannel(connectPeer(3, versionMessage3)); Peer c = PeerGroup.peerFromChannel(connectPeer(3, versionMessage3));
@@ -422,7 +422,6 @@ public class PeerGroupTest extends TestWithNetworkConnections {
PeerGroup.peerFromChannel(connectPeer(4, versionMessage3)); PeerGroup.peerFromChannel(connectPeer(4, versionMessage3));
assertEquals(3, peerGroup.getMostCommonChainHeight()); assertEquals(3, peerGroup.getMostCommonChainHeight());
assertEquals(c, peerGroup.getDownloadPeer()); // Switch to first peer advertising new height. assertEquals(c, peerGroup.getDownloadPeer()); // Switch to first peer advertising new height.
// New peer with a higher protocol version but same chain height. // New peer with a higher protocol version but same chain height.
VersionMessage versionMessage4 = new VersionMessage(params, 3); VersionMessage versionMessage4 = new VersionMessage(params, 3);
versionMessage4.clientVersion = 100000; versionMessage4.clientVersion = 100000;

8
examples/src/main/java/com/google/bitcoin/examples/PeerMonitor.java
View File

@@ -214,11 +214,7 @@ public class PeerMonitor {
return peer.getBestHeight(); return peer.getBestHeight();
case PING_TIME: case PING_TIME:
case LAST_PING_TIME: case LAST_PING_TIME:
long time = col == PING_TIME ? peer.getPingTime() : peer.getLastPingTime(); return col == PING_TIME ? peer.getPingTime() : peer.getLastPingTime();
if (time == Long.MAX_VALUE)
return 0L;
else
return time;
default: throw new RuntimeException(); default: throw new RuntimeException();
} }
@@ -267,7 +263,7 @@ public class PeerMonitor {
} }
boolean isPingColumn = column == PeerTableModel.PING_TIME || column == PeerTableModel.LAST_PING_TIME; boolean isPingColumn = column == PeerTableModel.PING_TIME || column == PeerTableModel.LAST_PING_TIME;
if (isPingColumn && contents == (Long)0L) { if (isPingColumn && contents.equals(Long.MAX_VALUE)) {
// We don't know the answer yet // We don't know the answer yet
str = ""; str = "";
} }