[RPC] Rpc batching id fix (#3429)

* New retry logic * New retry logic * Removed default * Changed default for exception types * Added a backoff strategy type * Removed unused code * Removed retry from ProvenBlockHeaderRepository * Removed unused using * Removed unused using * Removed unused using * Formatting fix * Changes for cancellation token in NetworkPeer * Fix for batch response id and content type * Reverted network peer changes * Reverted network peer connection changes * Reverted network peer connection changes * Reverted network peer connection changes * Fixed rpc middleware to match requests-response ids * Removed unused i
stratisproject · Mar 25, 2019 · 946287b · 946287b
1 parent 2ebb905
commit 946287b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/Stratis.Bitcoin.Features.RPC/RPCClient.cs b/src/Stratis.Bitcoin.Features.RPC/RPCClient.cs
@@ -445,7 +445,7 @@ public void CancelBatch()
 
             (RPCRequest request, TaskCompletionSource<RPCResponse> task) req;
             while (batches.TryDequeue(out req))
-                req.Item2.TrySetCanceled();
+                req.task.TrySetCanceled();
         }
 
         /// <summary>Send all commands in one batch.</summary>
@@ -493,17 +493,14 @@ private async Task SendBatchAsyncCoreAsync(List<(RPCRequest request, TaskComplet
             writer.Write("[");
 
             bool first = true;
-            var i = 1;
             foreach ((RPCRequest request, TaskCompletionSource<RPCResponse> task) item in requests)
             {
                 if (!first)
                     writer.Write(",");
                 else
                     first = false;
 
-                item.Item1.Id = i;
-                item.Item1.WriteJSON(writer);
-                i++;
+                item.request.WriteJSON(writer);
             }
 
             writer.Write("]");

diff --git a/src/Stratis.Bitcoin.Features.RPC/RPCMiddleware.cs b/src/Stratis.Bitcoin.Features.RPC/RPCMiddleware.cs
@@ -195,8 +195,10 @@ private async Task InvokeAsyncBatchAsync(HttpContext httpContext, JArray request
 
                 var response = (responseMemoryStream.Length == 0) ? CreateError(RPCErrorCode.RPC_METHOD_NOT_FOUND, "Method not found") : await JObject.LoadAsync(new JsonTextReader(new StreamReader(responseMemoryStream)));
 
-                if (response.ContainsKey("id"))
-                    response["id"] = i;
+                if (requestObj.ContainsKey("id"))
+                    response["id"] = requestObj["id"];
+                else
+                    response.Remove("id");
 
                 responses.Add(response);
                 i++;

diff --git a/src/Stratis.Bitcoin.Features.RPC/RPCRequest.cs b/src/Stratis.Bitcoin.Features.RPC/RPCRequest.cs
@@ -21,14 +21,13 @@ public RPCRequest(string method, object[] parameters)
         public RPCRequest()
         {
             this.JsonRpc = "1.0";
-            this.Id = 1;
         }
         public string JsonRpc
         {
             get;
             set;
         }
-        public int Id
+        public string Id
         {
             get;
             set;