diff --git a/src/deploy/package/shortcut-128.png b/src/deploy/package/shortcut-128.png index f41ea3a3d2..fda27db215 100644 Binary files a/src/deploy/package/shortcut-128.png and b/src/deploy/package/shortcut-128.png differ diff --git a/src/deploy/package/shortcut-128@2x.png b/src/deploy/package/shortcut-128@2x.png index d21ccf0179..fe3e241cff 100644 Binary files a/src/deploy/package/shortcut-128@2x.png and b/src/deploy/package/shortcut-128@2x.png differ diff --git a/src/deploy/package/shortcut-16.png b/src/deploy/package/shortcut-16.png index 8534c3e6b9..d34cd4d8d7 100644 Binary files a/src/deploy/package/shortcut-16.png and b/src/deploy/package/shortcut-16.png differ diff --git a/src/deploy/package/shortcut-16@2x.png b/src/deploy/package/shortcut-16@2x.png index b814586be3..936a7919ca 100644 Binary files a/src/deploy/package/shortcut-16@2x.png and b/src/deploy/package/shortcut-16@2x.png differ diff --git a/src/deploy/package/shortcut-256.png b/src/deploy/package/shortcut-256.png index d21ccf0179..fe3e241cff 100644 Binary files a/src/deploy/package/shortcut-256.png and b/src/deploy/package/shortcut-256.png differ diff --git a/src/deploy/package/shortcut-256@2x.png b/src/deploy/package/shortcut-256@2x.png index 85c9f4e0b3..11e1d65fec 100644 Binary files a/src/deploy/package/shortcut-256@2x.png and b/src/deploy/package/shortcut-256@2x.png differ diff --git a/src/deploy/package/shortcut-32.png b/src/deploy/package/shortcut-32.png index feab2dc4cc..936a7919ca 100644 Binary files a/src/deploy/package/shortcut-32.png and b/src/deploy/package/shortcut-32.png differ diff --git a/src/deploy/package/shortcut-32@2x.png b/src/deploy/package/shortcut-32@2x.png index 7103550b9f..6a20746931 100644 Binary files a/src/deploy/package/shortcut-32@2x.png and b/src/deploy/package/shortcut-32@2x.png differ diff --git a/src/deploy/package/shortcut-512.png b/src/deploy/package/shortcut-512.png index 85c9f4e0b3..11e1d65fec 100644 Binary files a/src/deploy/package/shortcut-512.png and b/src/deploy/package/shortcut-512.png differ diff --git a/src/deploy/package/shortcut-512@2x.png b/src/deploy/package/shortcut-512@2x.png index 5f2ce15db0..b9a91ab23c 100644 Binary files a/src/deploy/package/shortcut-512@2x.png and b/src/deploy/package/shortcut-512@2x.png differ diff --git a/src/deploy/package/shortcut-64.png b/src/deploy/package/shortcut-64.png index 62c25a2963..d32b9b6f77 100644 Binary files a/src/deploy/package/shortcut-64.png and b/src/deploy/package/shortcut-64.png differ diff --git a/src/deploy/package/shortcut-64@2x.png b/src/deploy/package/shortcut-64@2x.png index 4ed5be848d..fda27db215 100644 Binary files a/src/deploy/package/shortcut-64@2x.png and b/src/deploy/package/shortcut-64@2x.png differ diff --git a/src/deploy/package/shortcut.sketch b/src/deploy/package/shortcut.sketch deleted file mode 100644 index 2ff0993627..0000000000 Binary files a/src/deploy/package/shortcut.sketch and /dev/null differ diff --git a/src/test/java/io/bitsquare/BitSquareTestSuite.java b/src/test/java/io/bitsquare/BitSquareTestSuite.java index 70892e0bd2..8690e1ccf0 100644 --- a/src/test/java/io/bitsquare/BitSquareTestSuite.java +++ b/src/test/java/io/bitsquare/BitSquareTestSuite.java @@ -22,7 +22,6 @@ import io.bitsquare.gui.main.trade.createoffer.CreateOfferPMTest; import io.bitsquare.gui.util.BSFormatterTest; import io.bitsquare.gui.util.validation.BtcValidatorTest; import io.bitsquare.gui.util.validation.FiatValidatorTest; -import io.bitsquare.msg.P2PNodeTest; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -30,7 +29,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ RestrictionsTest.class, - P2PNodeTest.class, + /* P2PNodeTest.class,*/ FiatValidatorTest.class, RestrictionsTest.class, CreateOfferPMTest.class, diff --git a/src/test/java/io/bitsquare/msg/BasicUsecasesInLANTest.java b/src/test/java/io/bitsquare/msg/BasicUsecasesInLANTest.java index 2250f15da6..8079194247 100644 --- a/src/test/java/io/bitsquare/msg/BasicUsecasesInLANTest.java +++ b/src/test/java/io/bitsquare/msg/BasicUsecasesInLANTest.java @@ -43,6 +43,7 @@ import net.tomp2p.storage.Data; import org.junit.After; import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; @@ -93,6 +94,7 @@ public class BasicUsecasesInLANTest { } @Test + @Ignore public void testBootstrap() throws Exception { PeerDHT peerDHT = startClient(CLIENT_1_ID, CLIENT_1_PORT); assertEquals(CLIENT_1_PORT, peerDHT.peerAddress().tcpPort()); @@ -101,6 +103,7 @@ public class BasicUsecasesInLANTest { } @Test + @Ignore public void testDHT() throws Exception { PeerDHT peer1DHT = startClient(CLIENT_1_ID, CLIENT_1_PORT); PeerDHT peer2DHT = startClient(CLIENT_2_ID, CLIENT_2_PORT); @@ -121,6 +124,7 @@ public class BasicUsecasesInLANTest { } @Test + @Ignore public void testSendDirect() throws Exception { PeerDHT peer1DHT = startClient(CLIENT_1_ID, CLIENT_1_PORT); PeerDHT peer2DHT = startClient(CLIENT_2_ID, CLIENT_2_PORT); diff --git a/src/test/java/io/bitsquare/msg/BasicUsecasesInWANTest.java b/src/test/java/io/bitsquare/msg/BasicUsecasesInWANTest.java index c75a102dac..91fb8ec16f 100644 --- a/src/test/java/io/bitsquare/msg/BasicUsecasesInWANTest.java +++ b/src/test/java/io/bitsquare/msg/BasicUsecasesInWANTest.java @@ -112,12 +112,12 @@ public class BasicUsecasesInWANTest { log.debug("############# udpPort = " + peerDHT.peerAddress().udpPort()); // in case of port forwarding use that: - //assertEquals(CLIENT_IP, peerDHT.peerAddress().inetAddress().getHostAddress()); + assertEquals(CLIENT_IP, peerDHT.peerAddress().inetAddress().getHostAddress()); // in case of relay use that: - assertEquals("192.168.1.33", peerDHT.peerAddress().inetAddress().getHostAddress()); + //assertEquals("192.168.1.33", peerDHT.peerAddress().inetAddress().getHostAddress()); + - peerDHT.shutdown().awaitUninterruptibly(); } @@ -129,9 +129,11 @@ public class BasicUsecasesInWANTest { FuturePut futurePut1 = peer1DHT.put(Number160.createHash("key")).data(new Data("hallo1")).start(); futurePut1.awaitUninterruptibly(); + log.debug("futurePut1.isSuccess() = " + futurePut1.isSuccess()); // why fails that? // assertTrue(futurePut1.isSuccess()); + FutureGet futureGet2 = peer1DHT.get(Number160.createHash("key")).start(); futureGet2.awaitUninterruptibly(); assertTrue(futureGet2.isSuccess()); @@ -208,7 +210,7 @@ No future set beforehand, probably an early shutdown / timeout, or use setFailed futureDirect.awaitUninterruptibly(); - countDownLatch.await(5, TimeUnit.SECONDS); + countDownLatch.await(3, TimeUnit.SECONDS); if (countDownLatch.getCount() > 0) Assert.fail("The test method did not complete successfully!"); @@ -238,9 +240,21 @@ No future set beforehand, probably an early shutdown / timeout, or use setFailed FutureNAT futureNAT = peerNAT.startSetupPortforwarding(futureDiscover); futureNAT.awaitUninterruptibly(); if (futureNAT.isSuccess()) { - log.info("Automatic port forwarding is setup. Address = " + - futureNAT.peerAddress()); - return peerDHT; + FutureDiscover futureDiscover2 = peer.discover().peerAddress(masterNodeAddress).start(); + futureDiscover2.awaitUninterruptibly(); + if (futureDiscover.isSuccess()) { + log.info("Discover with direct connection successful. Address = " + futureDiscover + .peerAddress()); + + log.info("Automatic port forwarding is setup. Address = " + + futureNAT.peerAddress()); + return peerDHT; + } + else { + log.error("Bootstrap with NAT after futureDiscover2 failed " + futureDiscover2.failedReason()); + peer.shutdown().awaitUninterruptibly(); + return null; + } } else { FutureRelayNAT futureRelayNAT = peerNAT.startRelay(futureDiscover, futureNAT);