Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-09-23 22:44:59 -04:00
Code Issues Projects Releases Packages Wiki Activity

Factor out peer node creation in network stress test

Browse source 
This will be useful later when stopping and restarting peer nodes in mailbox send test.  I added a getter to ``P2PService`` to get its public keyring.
This commit is contained in:
Ivan Vilata-i-Balaguer 2016-05-10 12:00:18 +02:00
parent 9ad4f371b2
commit f74d88cb33
2 changed files with 26 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
network/src/main/java/io/bitsquare/p2p/P2PService.java
View file

@ -775,6 +775,11 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
return peerManager;
}
@VisibleForTesting
public KeyRing getKeyRing() {
return optionalKeyRing.get();
}
///////////////////////////////////////////////////////////////////////////////////////////
// Private
///////////////////////////////////////////////////////////////////////////////////////////

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

@ -140,24 +140,9 @@ public class NetworkStressTest {
for (int p = 0; p < nPeers; p++) {
// peer network port
final int peerPort = Utils.findFreeSystemPort();
// peer data directories
final File peerDir = new File(testDataDir.toFile(), String.format("peer-%06d", p));
final File peerTorDir = new File(peerDir, "tor");
final File peerStorageDir = new File(peerDir, "db");
final File peerKeysDir = new File(peerDir, "keys");
//noinspection ResultOfMethodCallIgnored
peerKeysDir.mkdirs(); // needed for creating the key ring
// peer keys
final KeyStorage peerKeyStorage = new KeyStorage(peerKeysDir);
final KeyRing peerKeyRing = new KeyRing(peerKeyStorage);
peerPKRings.add(peerKeyRing.getPubKeyRing());
final EncryptionService peerEncryptionService = new EncryptionService(peerKeyRing);
// create, save and start peer
final P2PService peer = new P2PService(seedNodesRepository, peerPort, peerTorDir, useLocalhost,
REGTEST_NETWORK_ID, peerStorageDir, new Clock(), peerEncryptionService, peerKeyRing);
final P2PService peer = createPeerNode(p, peerPort, useLocalhost, seedNodesRepository);
peerPKRings.add(peer.getKeyRing().getPubKeyRing());
peerNodes.add(peer);
peer.start(new PeerServiceListener(localServicesLatch, localServicesFailed));
}
@ -185,6 +170,25 @@ public class NetworkStressTest {
return new NodeAddress("localhost", port);
}
@NotNull
private P2PService createPeerNode(int n, int port, boolean useLocalhost, SeedNodesRepository seedNodesRepository) {
// peer data directories
final File peerDir = new File(testDataDir.toFile(), String.format("peer-%06d", n));
final File peerTorDir = new File(peerDir, "tor");
final File peerStorageDir = new File(peerDir, "db");
final File peerKeysDir = new File(peerDir, "keys");
//noinspection ResultOfMethodCallIgnored
peerKeysDir.mkdirs(); // needed for creating the key ring
// peer keys
final KeyStorage peerKeyStorage = new KeyStorage(peerKeysDir);
final KeyRing peerKeyRing = new KeyRing(peerKeyStorage);
final EncryptionService peerEncryptionService = new EncryptionService(peerKeyRing);
return new P2PService(seedNodesRepository, port, peerTorDir, useLocalhost,
REGTEST_NETWORK_ID, peerStorageDir, new Clock(), peerEncryptionService, peerKeyRing);
}
@After
public void tearDown() throws InterruptedException, IOException {
/** A barrier to wait for concurrent shutdown of services. */