let ixi module connect to ict instead of the other way around

src/main/java/org/iota/ict/Ict.java

@@ -71,15 +71,12 @@ public Ict(Properties properties) {
         sender.start();
         receiver.start();
 
-        remoteIctImplementation = properties.ixiEnabled ? createRemoteIctImplementation(properties.ixis) : null;
+        remoteIctImplementation = properties.ixiEnabled ? createRemoteIctImplementation() : null;
     }
 
-    private RemoteIctImplementation createRemoteIctImplementation(List<String> ixis) {
+    private RemoteIctImplementation createRemoteIctImplementation() {
         try {
-            RemoteIctImplementation remoteIctImplementation = new RemoteIctImplementation(this);
-            for (String ixi : ixis)
-                remoteIctImplementation.connectToIxi(ixi);
-            return remoteIctImplementation;
+            return new RemoteIctImplementation(this);
         } catch (Throwable t) {
             ErrorHandler.handleError(LOGGER, t, "failed to enable IXI");
             return null;

src/main/java/org/iota/ict/Main.java

@@ -45,9 +45,6 @@ public static void main(String[] args) {
 
         logger.info("Starting new Ict '" + properties.name + "' (version: " + Constants.ICT_VERSION + ")");
 
-        if (!properties.ixiEnabled && properties.ixis.size() > 0)
-            logger.warn("Not running any IXI modules because IXI is disabled. To enable IXI, set 'ixi_enabled = true' in your config file.");
-
         Ict ict;
         try {
             ict = new Ict(properties);

src/main/java/org/iota/ict/ixi/IxiModule.java

@@ -2,6 +2,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.iota.ict.Ict;
 import org.iota.ict.model.Transaction;
 import org.iota.ict.network.event.GossipFilter;
 import org.iota.ict.network.event.GossipListener;
@@ -11,6 +12,7 @@
 
 import java.net.MalformedURLException;
 import java.rmi.Naming;
+import java.rmi.NotBoundException;
 import java.rmi.RemoteException;
 import java.rmi.registry.LocateRegistry;
 import java.rmi.server.UnicastRemoteObject;
@@ -28,15 +30,15 @@ public abstract class IxiModule {
     }
 
     private final String name;
-    private RemoteIct ict;
-    private String ictName;
-    private final IxiModuleAdapter adapter;
+    private final RemoteIct ict;
 
-    public IxiModule(String name) {
-        this.name = name;
+    public IxiModule(String name, String ictName) {
         try {
-            adapter = new IxiModuleAdapter(name);
-        } catch (RemoteException e) {
+            this.name = name;
+            new IxiModuleAdapter(name);
+            ict = (RemoteIct) Naming.lookup("//localhost/" + ictName);
+            ict.onIxiConnect(name);
+        } catch (RemoteException | NotBoundException | MalformedURLException e) {
             throw new RuntimeException(e);
         }
     }
@@ -95,18 +97,6 @@ public void submit(Transaction transaction) {
         }
     }
 
-    private void setIct(String name) {
-        try {
-            ict = (RemoteIct) Naming.lookup("//localhost/" + name);
-            ictName = name;
-        } catch (Throwable t) {
-            ErrorHandler.handleError(logger, t, "Failed to accept connection to ict '" + name + "'");
-            throw new RuntimeException(t);
-        }
-    }
-
-    public abstract void onIctConnect(String name);
-
     public abstract void onTransactionReceived(GossipReceiveEvent event);
 
     public abstract void onTransactionSubmitted(GossipSubmitEvent event);
@@ -136,15 +126,5 @@ public void onTransactionReceived(GossipReceiveEvent event) {
         public void onTransactionSubmitted(GossipSubmitEvent event) {
             IxiModule.this.onTransactionSubmitted(event);
         }
-
-        @Override
-        public void onIctConnect(String name) throws RemoteException {
-            if (ict != null) {
-                logger.warn("Refusing Ict '" + name + "' (already connected to '" + ictName + "').");
-                throw new RemoteException("IXI is already connected to Ict '" + ictName + "'");
-            }
-            IxiModule.this.setIct(name);
-            IxiModule.this.onIctConnect(name);
-        }
     }
 }

src/main/java/org/iota/ict/ixi/RemoteIct.java

@@ -21,4 +21,6 @@ public interface RemoteIct extends Remote {
     void setGossipFilter(String moduleName, GossipFilter filter) throws RemoteException;
 
     void submit(Transaction transaction) throws RemoteException;
+
+    void onIxiConnect(String name) throws RemoteException;
 }

src/main/java/org/iota/ict/ixi/RemoteIctImplementation.java

@@ -10,6 +10,7 @@
 
 import java.net.MalformedURLException;
 import java.rmi.Naming;
+import java.rmi.NotBoundException;
 import java.rmi.RemoteException;
 import java.rmi.registry.LocateRegistry;
 import java.rmi.server.UnicastRemoteObject;
@@ -67,13 +68,13 @@ public void onTransactionReceived(GossipReceiveEvent event) {
         });
     }
 
-    public void connectToIxi(String name) {
+    @Override
+    public void onIxiConnect(String ixiName) {
         try {
-            RemoteIxiModule ixiModule = (RemoteIxiModule) Naming.lookup("//localhost/" + name);
-            ixiModulesByName.put(name, ixiModule);
-            ixiModule.onIctConnect(this.name);
-        } catch (Throwable t) {
-            ErrorHandler.handleError(Ict.LOGGER, t, "Failed connecting to IXI");
+            RemoteIxiModule ixiModule = (RemoteIxiModule) Naming.lookup("//localhost/" + ixiName);
+            ixiModulesByName.put(ixiName, ixiModule);
+        } catch (NotBoundException | MalformedURLException | RemoteException e) {
+            ErrorHandler.handleError(Ict.LOGGER, e, "Failed to accept connecting IXI module '"+ixiName+"'.");
         }
     }
 

src/main/java/org/iota/ict/ixi/RemoteIxiModule.java

@@ -11,6 +11,4 @@ public interface RemoteIxiModule extends Remote {
     void onTransactionReceived(GossipReceiveEvent event) throws RemoteException;
 
     void onTransactionSubmitted(GossipSubmitEvent event) throws RemoteException;
-
-    void onIctConnect(String name) throws RemoteException;
 }

src/main/java/org/iota/ict/network/Receiver.java

@@ -53,6 +53,8 @@ private void processIncoming(DatagramPacket packet) {
         if(sender == null)
             return;
 
+        sender.stats.receivedAll++;
+
         if(sender.reachedLimitOfAllowedTransactions()) {
             sender.stats.ignored++;
             return;
@@ -64,7 +66,6 @@ private void processIncoming(DatagramPacket packet) {
             return;
         }
 
-        sender.stats.receivedAll++;
         updateTransactionLog(sender, transaction);
         processRequest(sender, transaction);
     }

src/main/java/org/iota/ict/utils/Properties.java

@@ -34,7 +34,6 @@ public class Properties {
     public int port = 1337;
     public long logRoundDuration = 60000;
     public List<InetSocketAddress> neighbors = new LinkedList<>();
-    public List<String> ixis = new LinkedList<>();
 
     public static Properties fromFile(String path) {
         java.util.Properties propObject = new java.util.Properties();
@@ -63,7 +62,6 @@ public Properties() {
         neighbors = neighborsFromString(propObject.getProperty(Property.neighbors.name(), ""));
         spamEnabled = propObject.getProperty(Property.spam_enabled.name(), DEFAULT_PROPERTIES.spamEnabled + "").toLowerCase().equals("true");
         ixiEnabled = propObject.getProperty(Property.ixi_enabled.name(), DEFAULT_PROPERTIES.ixiEnabled + "").toLowerCase().equals("true");
-        ixis = stringListFromString(propObject.getProperty(Property.ixis.name(), ""));
     }
 
     private static List<String> stringListFromString(String string) {
@@ -152,7 +150,6 @@ java.util.Properties toPropObject() {
         propObject.setProperty(Property.neighbors.name(), neighborsToString());
         propObject.setProperty(Property.spam_enabled.name(), spamEnabled + "");
         propObject.setProperty(Property.ixi_enabled.name(), ixiEnabled + "");
-        propObject.setProperty(Property.ixis.name(), stringListToString(ixis));
         return propObject;
     }
 

src/test/java/org/iota/ict/ixi/IxiTest.java

@@ -21,15 +21,14 @@ public class IxiTest {
     @BeforeClass
     public static void setUp() {
 
-        ixi = new TestIxi();
         Properties properties = new Properties();
-        properties.minForwardDelay = 1;
+        properties.minForwardDelay = 0;
         properties.maxForwardDelay = 5;
-        properties.ixis.add(TestIxi.NAME);
         properties.ixiEnabled = true;
         ict = new Ict(properties);
         sleep(100);
-        Assert.assertTrue("ict could not connect to ixi", ixi.connected);
+
+        ixi = new TestIxi(properties.name);
     }
 
     @Test
@@ -106,24 +105,17 @@ private static void sleep(long ms) {
 class TestIxi extends IxiModule {
 
     static final String NAME = "simple.ixi";
-
-    boolean connected = false;
     GossipSubmitEvent receivedGossipSubmitEvent = null;
 
-    TestIxi() {
-        super(NAME);
+    TestIxi(String ictName) {
+        super(NAME, ictName);
     }
 
     @Override
     public void onTransactionReceived(GossipReceiveEvent event) {
 
     }
 
-    @Override
-    public void onIctConnect(String name) {
-        connected = true;
-    }
-
     @Override
     public void onTransactionSubmitted(GossipSubmitEvent event) {
         receivedGossipSubmitEvent = event;