Moving "Security" to a separate port, so there can be a Bouncycastle and a Spongycastle implementation. (BC doesn't work on Android, SC can't be used on Oracle's JVM)

networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java

@@ -26,7 +26,6 @@ import ch.dissem.bitmessage.exception.NodeException;
 import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.ports.NetworkHandler.MessageListener;
 import ch.dissem.bitmessage.utils.DebugUtils;
-import ch.dissem.bitmessage.utils.Security;
 import ch.dissem.bitmessage.utils.UnixTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,6 +43,7 @@ import java.util.concurrent.ConcurrentMap;
 
 import static ch.dissem.bitmessage.networking.Connection.Mode.CLIENT;
 import static ch.dissem.bitmessage.networking.Connection.State.*;
+import static ch.dissem.bitmessage.utils.Singleton.security;
 import static ch.dissem.bitmessage.utils.UnixTime.MINUTE;
 
 /**
@@ -275,7 +275,7 @@ public class Connection implements Runnable {
                 ObjectMessage objectMessage = (ObjectMessage) messagePayload;
                 try {
                     LOG.debug("Received object " + objectMessage.getInventoryVector());
-                    Security.checkProofOfWork(objectMessage, ctx.getNetworkNonceTrialsPerByte(), ctx.getNetworkExtraBytes());
+                    security().checkProofOfWork(objectMessage, ctx.getNetworkNonceTrialsPerByte(), ctx.getNetworkExtraBytes());
                     listener.receive(objectMessage);
                     ctx.getInventory().storeObject(objectMessage);
                     // offer object to some random nodes so it gets distributed throughout the network:

networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java

@@ -44,9 +44,9 @@ import static ch.dissem.bitmessage.utils.DebugUtils.inc;
 /**
  * Handles all the networky stuff.
  */
-public class NetworkNode implements NetworkHandler, ContextHolder {
+public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
     public final static int NETWORK_MAGIC_NUMBER = 8;
-    private final static Logger LOG = LoggerFactory.getLogger(NetworkNode.class);
+    private final static Logger LOG = LoggerFactory.getLogger(DefaultNetworkHandler.class);
     private final ExecutorService pool;
     private final List<Connection> connections = new LinkedList<>();
     private InternalContext ctx;
@@ -56,7 +56,7 @@ public class NetworkNode implements NetworkHandler, ContextHolder {
 
     private ConcurrentMap<InventoryVector, Long> requestedObjects = new ConcurrentHashMap<>();
 
-    public NetworkNode() {
+    public DefaultNetworkHandler() {
         pool = Executors.newCachedThreadPool();
     }
 
@@ -128,6 +128,11 @@ public class NetworkNode implements NetworkHandler, ContextHolder {
         }
     }
 
+    @Override
+    public boolean isRunning() {
+        return connectionManager != null && connectionManager.isAlive();
+    }
+
     @Override
     public void stop() {
         connectionManager.interrupt();

networking/src/test/java/ch/dissem/bitmessage/networking/DefaultNetworkHandlerTest.java

@@ -24,16 +24,21 @@ import org.junit.Ignore;
 import org.junit.Test;
 
 /**
- * Created by chris on 20.03.15.
+ * FIXME: there really should be sensible tests for the network handler
  */
-public class NetworkNodeTest {
+public class DefaultNetworkHandlerTest {
     private NetworkAddress localhost = new NetworkAddress.Builder().ipv4(127, 0, 0, 1).port(8444).build();
 
+    // void start(MessageListener listener);
+    // void stop();
+    // void offer(InventoryVector iv);
+    // Property getNetworkStatus();
+
     @Ignore
     @Test(expected = InterruptedException.class)
     public void testSendMessage() throws Exception {
         final Thread baseThread = Thread.currentThread();
-        NetworkNode net = new NetworkNode();
+        DefaultNetworkHandler net = new DefaultNetworkHandler();
 //        net.setListener(localhost, new NetworkHandler.MessageListener() {
 //            @Override
 //            public void receive(ObjectPayload payload) {