Fix the PeerTest.badMessage() test (#2)

* test should fail, not get stuck * fix packet magic in unittestparams, fix test badMessage
kmels · Dec 6, 2017 · c0727da · c0727da
1 parent 8fb98b4
commit c0727da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/src/main/java/org/bitcoinj/params/UnitTestParams.java b/core/src/main/java/org/bitcoinj/params/UnitTestParams.java
@@ -32,7 +32,7 @@ public class UnitTestParams extends AbstractBitcoinNetParams {
     public UnitTestParams() {
         super();
         id = ID_UNITTESTNET;
-        packetMagic = 0x0b110907;
+        packetMagic = 0xf4e5f3f4L;      // must be same as testnet3
         addressHeader = 111;
         p2shHeader = 196;
         acceptableAddressCodes = new int[] { addressHeader, p2shHeader };

diff --git a/core/src/test/java/org/bitcoinj/core/PeerTest.java b/core/src/test/java/org/bitcoinj/core/PeerTest.java
@@ -49,6 +49,7 @@
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -956,7 +957,7 @@ public void bitcoinSerializeToStream(OutputStream stream) throws IOException {
         }.bitcoinSerialize(), out);
         writeTarget.writeTarget.writeBytes(out.toByteArray());
         try {
-            result.get();
+            result.get(1, TimeUnit.SECONDS);
             fail();
         } catch (ExecutionException e) {
             assertTrue(e.getCause() instanceof ProtocolException);