Added option to connect to local Bitmessage client

(This makes it easier to debug some problem or make some tests)

demo/src/main/java/ch/dissem/bitmessage/demo/Application.java

@@ -17,14 +17,10 @@
 package ch.dissem.bitmessage.demo;
 
 import ch.dissem.bitmessage.BitmessageContext;
-import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
 import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.entity.valueobject.Label;
-import ch.dissem.bitmessage.networking.nio.NioNetworkHandler;
-import ch.dissem.bitmessage.ports.MemoryNodeRegistry;
-import ch.dissem.bitmessage.repository.*;
 import org.apache.commons.lang3.text.WordUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,17 +41,8 @@ public class Application {
 
     private BitmessageContext ctx;
 
-    public Application(InetAddress syncServer, int syncPort) {
+    public Application(BitmessageContext.Builder ctxBuilder, InetAddress syncServer, int syncPort) {
-        JdbcConfig jdbcConfig = new JdbcConfig();
+        ctx = ctxBuilder
-        ctx = new BitmessageContext.Builder()
-                .addressRepo(new JdbcAddressRepository(jdbcConfig))
-                .inventory(new JdbcInventory(jdbcConfig))
-                .nodeRegistry(new MemoryNodeRegistry())
-                .messageRepo(new JdbcMessageRepository(jdbcConfig))
-                .powRepo(new JdbcProofOfWorkRepository(jdbcConfig))
-                .networkHandler(new NioNetworkHandler())
-                .cryptography(new BouncyCryptography())
-                .port(48444)
             .listener(plaintext -> System.out.println("New Message from " + plaintext.getFrom() + ": " + plaintext.getSubject()))
             .build();
 

demo/src/main/java/ch/dissem/bitmessage/demo/Main.java

@@ -18,20 +18,29 @@ package ch.dissem.bitmessage.demo;
 
 import ch.dissem.bitmessage.BitmessageContext;
 import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
+import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
 import ch.dissem.bitmessage.networking.nio.NioNetworkHandler;
 import ch.dissem.bitmessage.ports.MemoryNodeRegistry;
+import ch.dissem.bitmessage.ports.NodeRegistry;
 import ch.dissem.bitmessage.repository.*;
 import ch.dissem.bitmessage.wif.WifExporter;
 import ch.dissem.bitmessage.wif.WifImporter;
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.CmdLineParser;
 import org.kohsuke.args4j.Option;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.InetAddress;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class Main {
+    private static final Logger LOG = LoggerFactory.getLogger(Main.class);
+
     public static void main(String[] args) throws IOException {
         if (System.getProperty("org.slf4j.simpleLogger.defaultLogLevel") == null)
             System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "ERROR");
@@ -45,18 +54,39 @@ public class Main {
         } catch (CmdLineException e) {
             parser.printUsage(System.err);
         }
-        if (options.exportWIF != null || options.importWIF != null) {
+
         JdbcConfig jdbcConfig = new JdbcConfig();
-            BitmessageContext ctx = new BitmessageContext.Builder()
+        BitmessageContext.Builder ctxBuilder = new BitmessageContext.Builder()
             .addressRepo(new JdbcAddressRepository(jdbcConfig))
             .inventory(new JdbcInventory(jdbcConfig))
-                    .nodeRegistry(new MemoryNodeRegistry())
             .messageRepo(new JdbcMessageRepository(jdbcConfig))
             .powRepo(new JdbcProofOfWorkRepository(jdbcConfig))
             .networkHandler(new NioNetworkHandler())
             .cryptography(new BouncyCryptography())
-                    .port(48444)
+            .port(48444);
-                    .build();
+        if (options.localPort != null) {
+            ctxBuilder.nodeRegistry(new NodeRegistry() {
+                @Override
+                public List<NetworkAddress> getKnownAddresses(int limit, long... streams) {
+                    return Arrays.stream(streams)
+                        .mapToObj(s -> new NetworkAddress.Builder()
+                            .ipv4(127, 0, 0, 1)
+                            .port(options.localPort)
+                            .stream(s).build())
+                        .collect(Collectors.toList());
+                }
+
+                @Override
+                public void offerAddresses(List<NetworkAddress> addresses) {
+                    LOG.info("Local node registry ignored offered addresses: " + addresses);
+                }
+            });
+        } else {
+            ctxBuilder.nodeRegistry(new MemoryNodeRegistry());
+        }
+
+        if (options.exportWIF != null || options.importWIF != null) {
+            BitmessageContext ctx = ctxBuilder.build();
 
             if (options.exportWIF != null) {
                 new WifExporter(ctx).addAll().write(options.exportWIF);
@@ -66,11 +96,14 @@ public class Main {
             }
         } else {
             InetAddress syncServer = options.syncServer == null ? null : InetAddress.getByName(options.syncServer);
-            new Application(syncServer, options.syncPort);
+            new Application(ctxBuilder, syncServer, options.syncPort);
         }
     }
 
     private static class CmdLineOptions {
+        @Option(name = "-local", usage = "Connect to local Bitmessage client on given port, instead of the usual connections from node.txt")
+        private Integer localPort;
+
         @Option(name = "-import", usage = "Import from keys.dat or other WIF file.")
         private File importWIF;
 

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

@@ -49,7 +49,9 @@ import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**
- * FIXME: there really should be sensible tests for the network handler
+ * Tests network handlers. This test is parametrized, so it can test both the nio and classic implementation
+ * as well as their combinations. It might be slightly over the top and will most probably be cleaned up once
+ * the nio implementation is deemed stable.
  */
 @RunWith(Parameterized.class)
 public class NetworkHandlerTest {