Add new combined neo/legacy node and connection bases

Part of sociomantic-tsunami#57.
gavin-norman-sociomantic · Aug 23, 2017 · 81df0c6 · 81df0c6
1 parent df877dd
commit 81df0c6
Show file tree

Hide file tree

Showing 14 changed files with 1,905 additions and 75 deletions.
diff --git a/src/swarm/neo/node/ConnectionHandler.d b/src/swarm/neo/node/ConnectionHandler.d
@@ -20,7 +20,7 @@
 
 *******************************************************************************/
 
-module swarm.neo.node.ConnectionHandler;
+deprecated module swarm.neo.node.ConnectionHandler;
 
 /*******************************************************************************
 
@@ -46,6 +46,7 @@ static this ( )
 
 /******************************************************************************/
 
+deprecated("Replace with swarm.node.simplified.NeoConnectionHandler;")
 class ConnectionHandler : IConnectionHandler
 {
     import swarm.neo.node.Connection;

diff --git a/src/swarm/node/connection/ConnectionHandler.d b/src/swarm/node/connection/ConnectionHandler.d
@@ -20,7 +20,7 @@
 
 *******************************************************************************/
 
-module swarm.node.connection.ConnectionHandler;
+deprecated module swarm.node.connection.ConnectionHandler;
 
 
 
@@ -160,6 +160,7 @@ public class ConnectionSetupParams
 
 *******************************************************************************/
 
+deprecated("Replace with swarm.node.simplified.LegacyConnectionHandlerTemplate")
 public abstract class ConnectionHandlerTemplate ( Commands : ICommandCodes )
     : ISwarmConnectionHandler
 {
@@ -379,6 +380,7 @@ public abstract class ConnectionHandlerTemplate ( Commands : ICommandCodes )
 
 *******************************************************************************/
 
+deprecated("Replace with swarm.node.simplified.LegacyConnectionHandlerBase")
 abstract public class ISwarmConnectionHandler : IFiberConnectionHandlerBase,
     Resettable, ISwarmConnectionHandlerInfo
 {

diff --git a/src/swarm/node/model/ChannelsNode.d b/src/swarm/node/model/ChannelsNode.d
@@ -12,7 +12,7 @@
 
 *******************************************************************************/
 
-module swarm.node.model.ChannelsNode;
+deprecated module swarm.node.model.ChannelsNode;
 
 
 
@@ -46,6 +46,7 @@ import ocean.transition;
 
 *******************************************************************************/
 
+deprecated("Replace with swarm.node.simplified.ChannelsNodeTemplate")
 public class ChannelsNodeBase
     ( Storage : IStorageEngine, ConnHandler : ISwarmConnectionHandler )
     : NodeBase!(ConnHandler), IChannelsNodeInfo
@@ -206,8 +207,11 @@ public class ChannelsNodeBase
 version (UnitTest)
 {
     import ocean.net.server.connection.IConnectionHandler;
+}
 
-    private class TestConnectionHandler : ISwarmConnectionHandler
+deprecated unittest
+{
+    static class TestConnectionHandler : ISwarmConnectionHandler
     {
         public this (void delegate(IConnectionHandler) a, ConnectionSetupParams b)
         {
@@ -216,7 +220,7 @@ version (UnitTest)
         override protected void handleCommand () {}
     }
 
-    private class TestStorageEngine : IStorageEngine
+    static class TestStorageEngine : IStorageEngine
     {
         public this ()
         {
@@ -227,9 +231,6 @@ version (UnitTest)
         public ulong num_records () { return 42; }
         public ulong num_bytes () { return 42; }
     }
-}
 
-unittest
-{
     alias ChannelsNodeBase!(TestStorageEngine, TestConnectionHandler) Instance;
 }
diff --git a/src/swarm/node/model/NeoChannelsNode.d b/src/swarm/node/model/NeoChannelsNode.d
@@ -12,7 +12,7 @@
 
 *******************************************************************************/
 
-module swarm.node.model.NeoChannelsNode;
+deprecated module swarm.node.model.NeoChannelsNode;
 
 
 
@@ -47,6 +47,7 @@ import ocean.transition;
 
 *******************************************************************************/
 
+deprecated("Replace with swarm.node.simplified.ChannelsNodeTemplate")
 public class ChannelsNodeBase (
     Storage : IStorageEngine,
     ConnHandler : ISwarmConnectionHandler
@@ -232,8 +233,11 @@ public class ChannelsNodeBase (
 version (UnitTest)
 {
     import ocean.net.server.connection.IConnectionHandler;
+}
 
-    private class TestConnectionHandler : ISwarmConnectionHandler
+deprecated unittest
+{
+    static class TestConnectionHandler : ISwarmConnectionHandler
     {
         public this (void delegate(IConnectionHandler) a, ConnectionSetupParams b)
         {
@@ -242,7 +246,7 @@ version (UnitTest)
         override protected void handleCommand () {}
     }
 
-    private class TestStorageEngine : IStorageEngine
+    static class TestStorageEngine : IStorageEngine
     {
         public this ()
         {
@@ -253,9 +257,6 @@ version (UnitTest)
         public ulong num_records () { return 42; }
         public ulong num_bytes () { return 42; }
     }
-}
 
-unittest
-{
     alias ChannelsNodeBase!(TestStorageEngine, TestConnectionHandler) Instance;
 }
diff --git a/src/swarm/node/model/NeoNode.d b/src/swarm/node/model/NeoNode.d
@@ -14,7 +14,7 @@
 
 *******************************************************************************/
 
-module swarm.node.model.NeoNode;
+deprecated module swarm.node.model.NeoNode;
 
 
 
@@ -77,6 +77,7 @@ static this ( )
 
 *******************************************************************************/
 
+deprecated("Replace with swarm.node.simplified.NodeBase")
 public abstract class INodeBase : INode, INodeInfo
 {
     /***************************************************************************
@@ -552,6 +553,7 @@ public abstract class INodeBase : INode, INodeInfo
 
 *******************************************************************************/
 
+deprecated("Replace with swarm.node.simplified.NodeTemplate")
 public class NodeBase ( ConnHandler : ISwarmConnectionHandler ) : INodeBase
 {
     import ocean.net.server.unix.UnixListener;
@@ -868,20 +870,16 @@ public class NodeBase ( ConnHandler : ISwarmConnectionHandler ) : INodeBase
     }
 }
 
-
-version (UnitTest)
+deprecated unittest
 {
-    private class TestConnectionHandler : ISwarmConnectionHandler
+    static class TestConnectionHandler : ISwarmConnectionHandler
     {
         public this (void delegate(IConnectionHandler) a, ConnectionSetupParams b)
         {
             super(a, b);
         }
         override protected void handleCommand () {}
     }
-}
 
-unittest
-{
     alias NodeBase!(TestConnectionHandler) Instance;
 }
diff --git a/src/swarm/node/model/Node.d b/src/swarm/node/model/Node.d
@@ -14,7 +14,7 @@
 
 *******************************************************************************/
 
-module swarm.node.model.Node;
+deprecated module swarm.node.model.Node;
 
 
 
@@ -75,6 +75,7 @@ static this ( )
 
 *******************************************************************************/
 
+deprecated("Replace with swarm.node.simplified.NodeBase")
 public abstract class INodeBase : INode, INodeInfo
 {
     /***************************************************************************
@@ -495,6 +496,7 @@ public abstract class INodeBase : INode, INodeInfo
 
 *******************************************************************************/
 
+deprecated("Replace with swarm.node.simplified.NodeTemplate")
 public class NodeBase ( ConnHandler : ISwarmConnectionHandler,
                         Setup : ConnectionSetupParams = ConnectionSetupParams ) : INodeBase
 {
@@ -617,20 +619,16 @@ public class NodeBase ( ConnHandler : ISwarmConnectionHandler,
     }
 }
 
-
-version (UnitTest)
+deprecated unittest
 {
-    private class TestConnectionHandler : ISwarmConnectionHandler
+    static class TestConnectionHandler : ISwarmConnectionHandler
     {
         public this (void delegate(IConnectionHandler) a, ConnectionSetupParams b)
         {
             super(a, b);
         }
         override protected void handleCommand () {}
     }
-}
 
-unittest
-{
     alias NodeBase!(TestConnectionHandler) Instance;
 }
diff --git a/src/swarm/node/model/RecordActionCounters.d b/src/swarm/node/model/RecordActionCounters.d
@@ -63,7 +63,7 @@ public class RecordActionCounters
 
     ***************************************************************************/
 
-    package this ( in cstring[] ids )
+    public this ( in cstring[] ids )
     {
         foreach (id; ids)
         {