Refactor API response

SharpPusher/Models/Response.cs

@@ -0,0 +1,21 @@
+// SharpPusher
+// Copyright (c) 2017 Coding Enthusiast
+// Distributed under the MIT software license, see the accompanying
+// file LICENCE or http://www.opensource.org/licenses/mit-license.php.
+
+namespace SharpPusher.Models
+{
+    public class Response
+    {
+        public bool IsSuccess { get; private set; } = true;
+        public string Message { get; private set; } = string.Empty;
+
+        private void SetMsg(string msg, bool success)
+        {
+            IsSuccess = success;
+            Message = msg;
+        }
+        public void SetMessage(string msg) => SetMsg(msg, true);
+        public void SetError(string msg) => SetMsg(msg, false);
+    }
+}

SharpPusher/Models/State.cs

@@ -0,0 +1,15 @@
+// SharpPusher
+// Copyright (c) 2017 Coding Enthusiast
+// Distributed under the MIT software license, see the accompanying
+// file LICENCE or http://www.opensource.org/licenses/mit-license.php.
+
+namespace SharpPusher.Models
+{
+    public enum State
+    {
+        Ready,
+        Broadcasting,
+        Success,
+        Failed
+    }
+}

SharpPusher/Services/Api.cs

@@ -4,6 +4,7 @@
 // file LICENCE or http://www.opensource.org/licenses/mit-license.php.
 
 using Newtonsoft.Json.Linq;
+using SharpPusher.Models;
 using System;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -23,7 +24,7 @@ public abstract class Api
         /// </summary>
         /// <param name="txHex">Signed raw transaction in hex format</param>
         /// <returns>Result of broadcasting.</returns>
-        public abstract Task<Response<string>> PushTx(string txHex);
+        public abstract Task<Response> PushTx(string txHex);
 
 
         /// <summary>
@@ -33,9 +34,9 @@ public abstract class Api
         /// <param name="jKey">The JSON key used for making the HttpContent in JSON format.</param>
         /// <param name="url">Api url to use.</param>
         /// <returns>Result of broadcasting.</returns>
-        protected static async Task<Response<string>> PushTx(string txHex, string jKey, string url)
+        protected static async Task<Response> PushTx(string txHex, string jKey, string url)
         {
-            Response<string> resp = new();
+            Response resp = new();
 
             using HttpClient client = new();
             try
@@ -46,12 +47,16 @@ protected static async Task<Response<string>> PushTx(string txHex, string jKey,
                 };
 
                 HttpResponseMessage httpResp = await client.PostAsync(url, new StringContent(tx.ToString()));
-                resp.Result = await httpResp.Content.ReadAsStringAsync();
+                if (!httpResp.IsSuccessStatusCode)
+                {
+                    resp.SetError("API response doesn't indicate success.");
+                }
+                resp.SetMessage(await httpResp.Content.ReadAsStringAsync());
             }
             catch (Exception ex)
             {
                 string errMsg = (ex.InnerException == null) ? ex.Message : ex.Message + " " + ex.InnerException;
-                resp.Errors.Add(errMsg);
+                resp.SetError(errMsg);
             }
 
             return resp;

SharpPusher/Services/P2P.cs

@@ -8,6 +8,7 @@
 using Autarkysoft.Bitcoin.Clients;
 using Autarkysoft.Bitcoin.P2PNetwork.Messages;
 using Autarkysoft.Bitcoin.P2PNetwork.Messages.MessagePayloads;
+using SharpPusher.Models;
 using System.Threading.Tasks;
 
 namespace SharpPusher.Services
@@ -46,25 +47,24 @@ public P2P(bool isMainNet)
 
         public override string ApiName => "P2P";
 
-        public override async Task<Response<string>> PushTx(string txHex)
+        public override async Task<Response> PushTx(string txHex)
         {
+            Response resp = new();
+
             Transaction tx = new(txHex);
             Message msg = new(new TxPayload(tx), netType);
 
             MinimalClientSettings settings = new(netType, 4, null)
             {
                 DnsSeeds = netType == NetworkType.MainNet ? DnsMain : DnsTest
             };
-            MinimalClient client = new(settings);
+            using MinimalClient client = new(settings);
             client.Start();
             await Task.Delay(TimeConstants.MilliSeconds.FiveSec);
             client.Send(msg);
 
-            return new Response<string>()
-            {
-                Result = $"Transaction was sent to {settings.MaxConnectionCount} nodes. " +
-                         $"Transaction ID: {tx.GetTransactionId()}"
-            };
+            resp.SetMessage($"Transaction was sent to {settings.MaxConnectionCount} nodes. Transaction ID: {tx.GetTransactionId()}");
+            return resp;
         }
     }
 }

SharpPusher/Services/PushServices/BlockCypher.cs

@@ -4,34 +4,32 @@
 // file LICENCE or http://www.opensource.org/licenses/mit-license.php.
 
 using Newtonsoft.Json.Linq;
+using SharpPusher.Models;
 using System.Threading.Tasks;
 
 namespace SharpPusher.Services.PushServices
 {
     public sealed class BlockCypher : Api
     {
-        public override string ApiName
-        {
-            get { return "BlockCypher"; }
-        }
+        public override string ApiName => "BlockCypher";
 
 
-        public override async Task<Response<string>> PushTx(string txHex)
+        public override async Task<Response> PushTx(string txHex)
         {
-            Response<string> resp = await PushTx(txHex, "tx", "https://api.blockcypher.com/v1/bcy/test/txs/push");
-            if (resp.Errors.Any())
+            Response resp = await PushTx(txHex, "tx", "https://api.blockcypher.com/v1/bcy/test/txs/push");
+            if (!resp.IsSuccess)
             {
                 return resp;
             }
 
-            JObject jResult = JObject.Parse(resp.Result);
+            JObject jResult = JObject.Parse(resp.Message);
             if (jResult["error"] != null)
             {
-                resp.Errors.Add(jResult["error"].ToString());
+                resp.SetError(jResult["error"].ToString());
             }
             else
             {
-                resp.Result = "Successfully done. Tx ID: " + jResult["hash"].ToString();
+                resp.SetMessage($"Successfully done. Tx ID: {jResult["hash"]}");
             }
 
             return resp;

SharpPusher/Services/PushServices/BlockchainInfo.cs

@@ -5,6 +5,7 @@
 
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using SharpPusher.Models;
 using System;
 using System.Net.Http;
 using System.Text;
@@ -14,53 +15,48 @@ namespace SharpPusher.Services.PushServices
 {
     public sealed class BlockchainInfo : Api
     {
-        public override string ApiName
-        {
-            get { return "Blockchain.Info"; }
-        }
+        public override string ApiName => "Blockchain.Info";
 
-        public async override Task<Response<string>> PushTx(string txHex)
+        public async override Task<Response> PushTx(string txHex)
         {
-            Response<string> resp = new Response<string>();
+            using HttpClient client = new();
+            Response resp = new();
 
-            using (HttpClient client = new HttpClient())
+            try
             {
-                try
-                {
-                    client.BaseAddress = new Uri("https://blockchain.info");
+                client.BaseAddress = new Uri("https://blockchain.info");
 
-                    string json = JsonConvert.SerializeObject(txHex);
-                    string contentType = "application/x-www-form-urlencoded";
-                    HttpContent httpContent = new MultipartFormDataContent
-                    {
-                        new StringContent(json, Encoding.UTF8, contentType)
-                    };
+                string json = JsonConvert.SerializeObject(txHex);
+                string contentType = "application/x-www-form-urlencoded";
+                HttpContent httpContent = new MultipartFormDataContent
+                {
+                    new StringContent(json, Encoding.UTF8, contentType)
+                };
 
-                    HttpResponseMessage result = await client.PostAsync("pushtx", httpContent);
-                    string sResult = await result.Content.ReadAsStringAsync();
-                    if (result.IsSuccessStatusCode)
+                HttpResponseMessage result = await client.PostAsync("pushtx", httpContent);
+                string sResult = await result.Content.ReadAsStringAsync();
+                if (result.IsSuccessStatusCode)
+                {
+                    if (sResult != null && sResult.StartsWith("{\"error\":"))
                     {
-                        if (sResult != null && sResult.StartsWith("{\"error\":"))
-                        {
-                            JObject jObject = JObject.Parse(sResult);
-                            resp.Errors.Add(jObject["error"].ToString());
-                        }
-                        else
-                        {
-                            resp.Result = sResult;
-                        }
+                        JObject jObject = JObject.Parse(sResult);
+                        resp.SetError(jObject["error"].ToString());
                     }
                     else
                     {
-                        resp.Errors.Add(sResult);
+                        resp.SetMessage(sResult);
                     }
                 }
-                catch (Exception ex)
+                else
                 {
-                    string errMsg = (ex.InnerException == null) ? ex.Message : ex.Message + " " + ex.InnerException;
-                    resp.Errors.Add(errMsg);
+                    resp.SetError(sResult);
                 }
             }
+            catch (Exception ex)
+            {
+                string errMsg = (ex.InnerException == null) ? ex.Message : ex.Message + " " + ex.InnerException;
+                resp.SetError(errMsg);
+            }
 
             return resp;
         }