Adapt Put to use new SupportedCode from swarm

Part of sociomantic-tsunami#78.
gavin-norman-sociomantic · Jan 9, 2018 · 398fa60 · 398fa60
1 parent 7c18fc4
commit 398fa60
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 18 deletions.
diff --git a/src/dhtproto/client/request/internal/Put.d b/src/dhtproto/client/request/internal/Put.d
@@ -187,19 +187,26 @@ public struct Put
             );
             conn.flush();
 
-            // Receive status from node
-            auto status = conn.receiveValue!(StatusCode)();
-            if ( !Put.handleGlobalStatusCodes(status, context,
+            // Receive supported code from node
+            auto supported = conn.receiveValue!(SupportedStatus)();
+            if ( !Put.handleSupportedCodes(supported, context,
                 conn.remote_address) )
             {
-                switch ( status )
+                // Request not supported; abort further handling.
+                context.shared_working.result = SharedWorking.Result.Error;
+            }
+            else
+            {
+                // Request supported; read result code from node.
+                auto result = conn.receiveValue!(MessageType)();
+                switch ( result )
                 {
-                    case RequestStatusCode.Put:
+                    case MessageType.Put:
                         context.shared_working.result =
                             SharedWorking.Result.Success;
                         break;
 
-                    case RequestStatusCode.WrongNode:
+                    case MessageType.WrongNode:
                         context.shared_working.result =
                             SharedWorking.Result.Error;
 
@@ -210,7 +217,7 @@ public struct Put
                         Put.notify(context.user_params, n);
                         break;
 
-                    case RequestStatusCode.Error:
+                    case MessageType.Error:
                         context.shared_working.result =
                             SharedWorking.Result.Error;
 
@@ -222,10 +229,10 @@ public struct Put
                         break;
 
                     default:
-                        log.warn("Received unknown status code {} from node "
+                        log.warn("Received unknown message code {} from node "
                             ~ "in response to Put request. Treating as "
-                            ~ "Error.", status);
-                        goto case RequestStatusCode.Error;
+                            ~ "Error.", result);
+                        goto case MessageType.Error;
                 }
             }
         }

diff --git a/src/dhtproto/common/Put.d b/src/dhtproto/common/Put.d
@@ -12,15 +12,13 @@
 
 module dhtproto.common.Put;
 
-import swarm.neo.request.Command;
-
 /*******************************************************************************
 
-    Status code enum. Sent from the node to the client.
+    Message type enum. Sent from the node to the client.
 
 *******************************************************************************/
 
-public enum RequestStatusCode : StatusCode
+public enum MessageType : ubyte
 {
     /// Invalid, default value
     None,

diff --git a/src/dhtproto/node/neo/request/Put.d b/src/dhtproto/node/neo/request/Put.d
@@ -54,16 +54,16 @@ public abstract scope class PutProtocol_v0
         auto key = *ed.message_parser.getValue!(hash_t)(msg_payload);
         auto value = ed.message_parser.getArray!(void)(msg_payload);
 
-        RequestStatusCode response;
+        MessageType response;
 
         // Check record key and write to channel, if ok.
         if ( this.responsibleForKey(key) )
         {
             response = this.put(channel, key, value)
-                ? RequestStatusCode.Put : RequestStatusCode.Error;
+                ? MessageType.Put : MessageType.Error;
         }
         else
-            response = RequestStatusCode.WrongNode;
+            response = MessageType.WrongNode;
 
         // Send status code
         ed.send(

diff --git a/src/fakedht/neo/request/Put.d b/src/fakedht/neo/request/Put.d
@@ -45,16 +45,23 @@ public void handle ( Object shared_resources, RequestOnConn connection,
     Command.Version cmdver, Const!(void)[] msg_payload )
 {
     auto resources = new SharedResources;
+    auto ed = connection.event_dispatcher;
 
     switch ( cmdver )
     {
         case 0:
+            ed.send(
+                ( ed.Payload payload )
+                {
+                    payload.addConstant(SupportedStatus.RequestSupported);
+                }
+            );
+
             scope rq = new PutImpl_v0(resources);
             rq.handle(connection, msg_payload);
             break;
 
         default:
-            auto ed = connection.event_dispatcher;
             ed.send(
                 ( ed.Payload payload )
                 {