Fixed synchronization

This commit is contained in:
Christian Basler 2016-01-17 07:13:29 +01:00
parent ac6f291964
commit 35077243b0
2 changed files with 5 additions and 5 deletions

View File

@ -350,7 +350,7 @@ class Connection {
send(new Version.Builder().defaults().addrFrom(host).addrRecv(node).build());
}
while (state != DISCONNECTED) {
if (requestedObjects.isEmpty()) {
if (mode != SYNC && state == ACTIVE && requestedObjects.isEmpty()) {
Thread.sleep(1000);
} else {
Thread.sleep(100);

View File

@ -94,7 +94,7 @@ public class NetworkHandlerTest {
} while (node.isRunning());
}
@Test(timeout = 20_000)
@Test(timeout = 5_000)
public void ensureNodesAreConnecting() {
try {
node.startup();
@ -109,7 +109,7 @@ public class NetworkHandlerTest {
}
}
@Test(timeout = 10_000)
@Test(timeout = 5_000)
public void ensureObjectsAreSynchronizedIfBothHaveObjects() throws Exception {
peerInventory.init(
"V4Pubkey.payload",
@ -128,7 +128,7 @@ public class NetworkHandlerTest {
assertInventorySize(3, peerInventory);
}
@Test(timeout = 10_000)
@Test(timeout = 5_000)
public void ensureObjectsAreSynchronizedIfOnlyPeerHasObjects() throws Exception {
peerInventory.init(
"V4Pubkey.payload",
@ -145,7 +145,7 @@ public class NetworkHandlerTest {
assertInventorySize(2, peerInventory);
}
@Test(timeout = 10_000)
@Test(timeout = 5_000)
public void ensureObjectsAreSynchronizedIfOnlyNodeHasObjects() throws Exception {
peerInventory.init();