Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-06-27 16:17:37 -04:00
Code Issues Projects Releases Packages Wiki Activity

Rename to TomP2PTests, add logs

Browse source
This commit is contained in:
Manfred Karrer 2014-11-05 14:59:59 +01:00
parent 6c1c1056bb
commit 5533be6e57
1 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/test/java/io/bitsquare/msg/TomP2PTestSuite.java → src/test/java/io/bitsquare/msg/TomP2PTests.java
View file

@ -63,8 +63,8 @@ import static org.junit.Assert.*;
* In the configure method and the connectionType you can define your test scenario further. * In the configure method and the connectionType you can define your test scenario further.
*/ */
public class TomP2PTestSuite { public class TomP2PTests {
private static final Logger log = LoggerFactory.getLogger(TomP2PTestSuite.class); private static final Logger log = LoggerFactory.getLogger(TomP2PTests.class);
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
// Configure // Configure
@ -103,9 +103,10 @@ public class TomP2PTestSuite {
// In port forwarding mode the isSuccess returns false, but the DHT operations succeeded. // In port forwarding mode the isSuccess returns false, but the DHT operations succeeded.
// Needs investigation why. // Needs investigation why.
private boolean ignoreSuccessTests = false; private boolean ignoreSuccessTests = true;
// Don't create and bootstrap the nodes at every test but reuse already created ones. // If cache is used tests get faster as it doesn't create and bootstrap a new node at every test.
// Need to observe if it can have some side effects.
private boolean cacheClients = true; private boolean cacheClients = true;
@ -133,7 +134,7 @@ public class TomP2PTestSuite {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
// Define your seed node IP and port // Define your seed node IP and port
// "127.0.0.1" for localhost or SEED_ID_WAN_1 // "127.0.0.1" for localhost or SEED_ID_WAN_1
new TomP2PTestSuite().startSeedNode("127.0.0.1", 5000); new TomP2PTests().startSeedNode("127.0.0.1", 5000);
} }
public Thread startSeedNode(String seedNodeId, int seedNodePort) { public Thread startSeedNode(String seedNodeId, int seedNodePort) {
@ -196,7 +197,7 @@ public class TomP2PTestSuite {
@Test @Test
@Ignore // @Ignore
public void testPutGet() throws Exception { public void testPutGet() throws Exception {
PeerDHT peer1DHT = getDHTPeer("node_1", CLIENT_1_PORT); PeerDHT peer1DHT = getDHTPeer("node_1", CLIENT_1_PORT);
PeerDHT peer2DHT = getDHTPeer("node_2", CLIENT_2_PORT); PeerDHT peer2DHT = getDHTPeer("node_2", CLIENT_2_PORT);
@ -372,7 +373,7 @@ public class TomP2PTestSuite {
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
// Utils // Bootstrapping
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
private Peer bootstrapDirectConnection(String clientId, int clientPort) { private Peer bootstrapDirectConnection(String clientId, int clientPort) {
@ -398,10 +399,12 @@ public class TomP2PTestSuite {
return peer; return peer;
} }
else { else {
log.warn("Discover with direct connection failed. Reason = " + futureDiscover.failedReason());
peer.shutdown().awaitUninterruptibly(); peer.shutdown().awaitUninterruptibly();
return null; return null;
} }
} catch (IOException e) { } catch (IOException e) {
log.warn("Discover with direct connection failed. Exception = " + e.getMessage());
if (peer != null) if (peer != null)
peer.shutdown().awaitUninterruptibly(); peer.shutdown().awaitUninterruptibly();
@ -430,27 +433,31 @@ public class TomP2PTestSuite {
FutureNAT futureNAT = peerNAT.startSetupPortforwarding(futureDiscover); FutureNAT futureNAT = peerNAT.startSetupPortforwarding(futureDiscover);
futureNAT.awaitUninterruptibly(); futureNAT.awaitUninterruptibly();
if (futureNAT.isSuccess()) { if (futureNAT.isSuccess()) {
log.info("Automatic port forwarding is setup. Address = " + log.info("Automatic port forwarding is setup. Now we do a futureDiscover again. Address = " +
futureNAT.peerAddress()); futureNAT.peerAddress());
futureDiscover = peer.discover().peerAddress(masterNodeAddress).start();
futureDiscover.awaitUninterruptibly(); futureDiscover.awaitUninterruptibly();
if (futureDiscover.isSuccess()) { if (futureDiscover.isSuccess()) {
log.info("Discover with automatic port forwarding successful. Address = " + futureDiscover log.info("Discover with automatic port forwarding was successful. Address = " + futureDiscover
.peerAddress()); .peerAddress());
cachedPeers.put(id, peer); cachedPeers.put(id, peer);
return peer; return peer;
} }
else { else {
log.warn("Discover with automatic port forwarding failed. Reason = " + futureDiscover
.failedReason());
peer.shutdown().awaitUninterruptibly(); peer.shutdown().awaitUninterruptibly();
return null; return null;
} }
} }
else { else {
log.error("Bootstrap with NAT after futureDiscover2 failed " + futureDiscover log.warn("StartSetupPortforwarding failed. Reason = " + futureNAT
.failedReason()); .failedReason());
peer.shutdown().awaitUninterruptibly(); peer.shutdown().awaitUninterruptibly();
return null; return null;
} }
} catch (IOException e) { } catch (IOException e) {
log.warn("Discover with automatic port forwarding failed. Exception = " + e.getMessage());
if (peer != null) if (peer != null)
peer.shutdown().awaitUninterruptibly(); peer.shutdown().awaitUninterruptibly();
@ -481,7 +488,7 @@ public class TomP2PTestSuite {
FutureRelayNAT futureRelayNAT = peerNAT.startRelay(futureDiscover, futureNAT); FutureRelayNAT futureRelayNAT = peerNAT.startRelay(futureDiscover, futureNAT);
futureRelayNAT.awaitUninterruptibly(); futureRelayNAT.awaitUninterruptibly();
if (futureRelayNAT.isSuccess()) { if (futureRelayNAT.isSuccess()) {
log.info("Bootstrap using relay successful. Address = " + peer.peerAddress()); log.info("Bootstrap using relay was successful. Address = " + peer.peerAddress());
cachedPeers.put(id, peer); cachedPeers.put(id, peer);
return peer; return peer;
@ -493,6 +500,7 @@ public class TomP2PTestSuite {
return null; return null;
} }
} catch (IOException e) { } catch (IOException e) {
log.error("Bootstrap using relay failed. Exception " + e.getMessage());
if (peer != null) if (peer != null)
peer.shutdown().awaitUninterruptibly(); peer.shutdown().awaitUninterruptibly();