Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-02 19:56:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use plain system milliseconds instead of instants and durations

Browse source 
For consistency with the rest of the stress test.
This commit is contained in:
Ivan Vilata-i-Balaguer 2016-05-03 14:22:24 +02:00
parent 987b28e4e2
commit e7e45f497e
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
network/src/test/java/io/bitsquare/p2p/network/NetworkStressTest.java
View file

@ -28,8 +28,6 @@ import java.io.IOException;
import java.nio.file.*; import java.nio.file.*;
import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.attribute.BasicFileAttributes;
import java.security.Security; import java.security.Security;
import java.time.Duration;
import java.time.Instant;
import java.util.*; import java.util.*;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -193,7 +191,7 @@ public class NetworkStressTest {
BooleanProperty sentDirectFailed = new SimpleBooleanProperty(false); BooleanProperty sentDirectFailed = new SimpleBooleanProperty(false);
final CountDownLatch sentDirectLatch = new CountDownLatch(DIRECT_COUNT * nPeers); final CountDownLatch sentDirectLatch = new CountDownLatch(DIRECT_COUNT * nPeers);
final CountDownLatch receivedDirectLatch = new CountDownLatch(DIRECT_COUNT * nPeers); final CountDownLatch receivedDirectLatch = new CountDownLatch(DIRECT_COUNT * nPeers);
final Instant sendStart = Instant.now(); final long sendStartMillis = System.currentTimeMillis();
for (final P2PService srcPeer : peerNodes) { for (final P2PService srcPeer : peerNodes) {
// Make the peer ready for receiving direct messages. // Make the peer ready for receiving direct messages.
srcPeer.addDecryptedDirectMessageListener((decryptedMsgWithPubKey, peerNodeAddress) -> { srcPeer.addDecryptedDirectMessageListener((decryptedMsgWithPubKey, peerNodeAddress) -> {
@ -240,13 +238,13 @@ public class NetworkStressTest {
org.junit.Assert.assertTrue("timed out while receiving direct messages", org.junit.Assert.assertTrue("timed out while receiving direct messages",
receivedDirectLatch.await(2 * idealMaxDirectDelay, TimeUnit.MILLISECONDS)); receivedDirectLatch.await(2 * idealMaxDirectDelay, TimeUnit.MILLISECONDS));
print("receiving %d direct messages per peer took %ss", DIRECT_COUNT, print("receiving %d direct messages per peer took %ss", DIRECT_COUNT,
Duration.between(sendStart, Instant.now()).toMillis()/1000.0); (System.currentTimeMillis() - sendStartMillis)/1000.0);
// Wait for peers to complete sending. // Wait for peers to complete sending.
// This should be nearly instantaneous after waiting for reception is completed. // This should be nearly instantaneous after waiting for reception is completed.
org.junit.Assert.assertTrue("timed out while sending direct messages", org.junit.Assert.assertTrue("timed out while sending direct messages",
sentDirectLatch.await(idealMaxDirectDelay / 10, TimeUnit.MILLISECONDS)); sentDirectLatch.await(idealMaxDirectDelay / 10, TimeUnit.MILLISECONDS));
print("sending %d direct messages per peer took %ss", DIRECT_COUNT, print("sending %d direct messages per peer took %ss", DIRECT_COUNT,
Duration.between(sendStart, Instant.now()).toMillis()/1000.0); (System.currentTimeMillis() - sendStartMillis)/1000.0);
org.junit.Assert.assertFalse("some peer(s) failed to send a direct message", sentDirectFailed.get()); org.junit.Assert.assertFalse("some peer(s) failed to send a direct message", sentDirectFailed.get());
} }