Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-07 06:44:16 +00:00
Code Issues Projects Releases Wiki Activity

Re-evaluate download peer when a new peer connects. Add unit tests for selecting the best peer.

Browse Source
This commit is contained in:
Mike Hearn 2012-12-24 23:48:48 +00:00
parent ffc953abc8
commit 22ff79dd8a
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/main/java/com/google/bitcoin/core/PeerGroup.java
View File

@ -76,7 +76,7 @@ public class PeerGroup extends AbstractIdleService {
private List<Peer> pendingPeers;
private Map<Peer, ChannelFuture> channelFutures;
// The peer we are currently downloading the chain from
// The peer that has been selected for the purposes of downloading announced data.
private Peer downloadPeer;
// Callback for events related to chain download
private PeerEventListener downloadListener;
@ -641,18 +641,21 @@ public class PeerGroup extends AbstractIdleService {
}
protected synchronized void handleNewPeer(final Peer peer) {
// Runs on a netty worker thread for every peer that is newly connected.
// Runs on a netty worker thread for every peer that is newly connected. Peer is not locked at this point.
log.info("{}: New peer", peer);
// Link the peer to the memory pool so broadcast transactions have their confidence levels updated.
peer.setMemoryPool(memoryPool);
peer.setDownloadData(false);
// If we want to download the chain, and we aren't currently doing so, do so now.
if (downloadListener != null && downloadPeer == null && chain != null) {
log.info(" starting block chain download");
startBlockChainDownloadFromPeer(peer);
} else if (downloadPeer == null) {
setDownloadPeer(selectDownloadPeer(peers));
} else {
peer.setDownloadData(false);
// Re-evaluate download peers.
Peer newDownloadPeer = selectDownloadPeer(peers);
if (downloadPeer != newDownloadPeer) {
setDownloadPeer(newDownloadPeer);
}
}
// Make sure the peer knows how to upload transactions that are requested from us.
peer.addEventListener(getDataListener);
@ -1134,4 +1137,12 @@ public class PeerGroup extends AbstractIdleService {
return t;
}
}
/**
* Returns the currently selected download peer. Bear in mind that it may have changed as soon as this method
* returns. Can return null if no peer was selected.
*/
public Peer getDownloadPeer() {
return downloadPeer;
}
}

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

@ -292,6 +292,8 @@ public class PeerGroupTest extends TestWithNetworkConnections {
FakeChannel p1 = connectPeer(1, new VersionMessage(params, 2));
FakeChannel p2 = connectPeer(2);
assertNotNull(peerGroup.getDownloadPeer());
control.replay();
peerGroup.setMinBroadcastConnections(2);
@ -407,13 +409,18 @@ public class PeerGroupTest extends TestWithNetworkConnections {
peerGroup.startAndWait();
VersionMessage versionMessage2 = new VersionMessage(params, 2);
VersionMessage versionMessage3 = new VersionMessage(params, 3);
connectPeer(1, versionMessage2);
assertNull(peerGroup.getDownloadPeer());
Peer a = PeerGroup.peerFromChannel(connectPeer(1, versionMessage2));
assertEquals(2, peerGroup.getMostCommonChainHeight());
connectPeer(2, versionMessage2);
assertEquals(a, peerGroup.getDownloadPeer());
Peer b = PeerGroup.peerFromChannel(connectPeer(2, versionMessage2));
assertEquals(2, peerGroup.getMostCommonChainHeight());
connectPeer(3, versionMessage3);
assertEquals(a, peerGroup.getDownloadPeer()); // No change.
Peer c = PeerGroup.peerFromChannel(connectPeer(3, versionMessage3));
assertEquals(2, peerGroup.getMostCommonChainHeight());
connectPeer(4, versionMessage3);
assertEquals(a, peerGroup.getDownloadPeer()); // No change yet.
Peer d = PeerGroup.peerFromChannel(connectPeer(4, versionMessage3));
assertEquals(3, peerGroup.getMostCommonChainHeight());
assertEquals(c, peerGroup.getDownloadPeer()); // Switch to first peer advertising new height.
}
}

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

@ -251,7 +251,7 @@ public class PeerMonitor {
setFont(normal);
setForeground(Color.LIGHT_GRAY);
} else {
if (model.connectedPeers.get(row).getDownloadData())
if (model.connectedPeers.get(row) == peerGroup.getDownloadPeer())
setFont(bold);
else
setFont(normal);