Improved tests and fixed some

core/build.gradle

@@ -25,7 +25,7 @@ artifacts {
 
 dependencies {
     compile 'org.slf4j:slf4j-api:1.7.12'
-    testCompile 'junit:junit:4.11'
+    testCompile 'junit:junit:4.12'
     testCompile 'org.hamcrest:hamcrest-library:1.3'
     testCompile 'org.mockito:mockito-core:1.10.19'
     testCompile project(':cryptography-bc')

core/src/main/java/ch/dissem/bitmessage/entity/Version.java

@@ -24,7 +24,6 @@ import ch.dissem.bitmessage.utils.UnixTime;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
-import java.util.Random;
 
 /**
  * The 'version' command advertises this node's latest supported protocol version upon initiation.

core/src/main/java/ch/dissem/bitmessage/factory/Factory.java

@@ -40,7 +40,7 @@ import static ch.dissem.bitmessage.utils.Singleton.cryptography;
  * Creates {@link NetworkMessage} objects from {@link InputStream InputStreams}
  */
 public class Factory {
-    public static final Logger LOG = LoggerFactory.getLogger(Factory.class);
+    private static final Logger LOG = LoggerFactory.getLogger(Factory.class);
 
     public static NetworkMessage getNetworkMessage(int version, InputStream stream) throws SocketTimeoutException {
         try {

core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java

@@ -52,23 +52,21 @@ public class V3MessageReader {
                     state = ReaderState.HEADER;
                 case HEADER:
                     if (buffer.remaining() < 20) {
-                        buffer.compact();
                         return;
                     }
                     command = getCommand(buffer);
                     length = (int) Decode.uint32(buffer);
                     if (length > MAX_PAYLOAD_SIZE) {
-                        throw new NodeException("Payload of " + length + " bytes received, no more than 1600003 was expected.");
+                        throw new NodeException("Payload of " + length + " bytes received, no more than " +
+                                MAX_PAYLOAD_SIZE + " was expected.");
                     }
                     checksum = new byte[4];
                     buffer.get(checksum);
                     state = ReaderState.DATA;
-                    if (buffer.remaining() < length) {
-                        // We need to compact the buffer to make sure the message fits even if it's really big.
-                        buffer.compact();
-                    }
                 case DATA:
-                    if (buffer.remaining() < length) return;
+                    if (buffer.remaining() < length) {
+                        return;
+                    }
                     if (!testChecksum(buffer)) {
                         throw new NodeException("Checksum failed for message '" + command + "'");
                     }
@@ -95,34 +93,35 @@ public class V3MessageReader {
     private boolean findMagicBytes(ByteBuffer buffer) {
         int i = 0;
         while (buffer.hasRemaining()) {
-            if (buffer.get() == MAGIC_BYTES[i]) {
+            if (i == 0) {
                 buffer.mark();
+            }
+            if (buffer.get() == MAGIC_BYTES[i]) {
                 i++;
-                if (i == MAGIC_BYTES.length) return true;
+                if (i == MAGIC_BYTES.length) {
+                    return true;
+                }
             } else {
                 i = 0;
             }
         }
         if (i > 0) {
             buffer.reset();
-            buffer.compact();
-        } else {
-            buffer.clear();
         }
         return false;
     }
 
     private static String getCommand(ByteBuffer buffer) {
         int start = buffer.position();
-        int i = 0;
-        while (i < 12 && buffer.get() != 0) i++;
-        int end = start + i;
+        int l = 0;
+        while (l < 12 && buffer.get() != 0) l++;
+        int i = l + 1;
         while (i < 12) {
             if (buffer.get() != 0) throw new NodeException("'\\0' padding expected for command");
             i++;
         }
         try {
-            return new String(buffer.array(), start, end, "ASCII");
+            return new String(buffer.array(), start, l, "ASCII");
         } catch (UnsupportedEncodingException e) {
             throw new ApplicationException(e);
         }

core/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java

@@ -43,7 +43,7 @@ import static ch.dissem.bitmessage.utils.Numbers.max;
  * Implements everything that isn't directly dependent on either Spongy- or Bouncycastle.
  */
 public abstract class AbstractCryptography implements Cryptography, InternalContext.ContextHolder {
-    public static final Logger LOG = LoggerFactory.getLogger(Cryptography.class);
+    protected static final Logger LOG = LoggerFactory.getLogger(Cryptography.class);
     private static final SecureRandom RANDOM = new SecureRandom();
     private static final BigInteger TWO = BigInteger.valueOf(2);
     private static final BigInteger TWO_POW_64 = TWO.pow(64);