Refactor

src/Miningcore/Blockchain/Bitcoin/BitcoinJobManager.cs

@@ -7,6 +7,7 @@
 using Miningcore.Extensions;
 using Miningcore.JsonRpc;
 using Miningcore.Messaging;
+using Miningcore.Rpc;
 using Miningcore.Stratum;
 using Miningcore.Time;
 using Newtonsoft.Json;

src/Miningcore/Blockchain/Bitcoin/BitcoinJobManagerBase.cs

@@ -11,6 +11,7 @@
 using Miningcore.Messaging;
 using Miningcore.Mining;
 using Miningcore.Notifications.Messages;
+using Miningcore.Rpc;
 using Miningcore.Time;
 using NBitcoin;
 using Newtonsoft.Json;

src/Miningcore/Blockchain/Bitcoin/BitcoinPayoutHandler.cs

@@ -11,6 +11,7 @@
 using Miningcore.Persistence;
 using Miningcore.Persistence.Model;
 using Miningcore.Persistence.Repositories;
+using Miningcore.Rpc;
 using Miningcore.Time;
 using Miningcore.Util;
 using Newtonsoft.Json;

src/Miningcore/Blockchain/Cryptonote/CryptonoteJobManager.cs

@@ -16,6 +16,7 @@
 using Miningcore.Mining;
 using Miningcore.Native;
 using Miningcore.Notifications.Messages;
+using Miningcore.Rpc;
 using Miningcore.Stratum;
 using Miningcore.Time;
 using Miningcore.Util;

src/Miningcore/Blockchain/Cryptonote/CryptonotePayoutHandler.cs

@@ -14,6 +14,7 @@
 using Miningcore.Persistence;
 using Miningcore.Persistence.Model;
 using Miningcore.Persistence.Repositories;
+using Miningcore.Rpc;
 using Miningcore.Time;
 using Miningcore.Util;
 using Newtonsoft.Json;

src/Miningcore/Blockchain/Equihash/EquihashJobManager.cs

@@ -10,6 +10,7 @@
 using Miningcore.Extensions;
 using Miningcore.JsonRpc;
 using Miningcore.Messaging;
+using Miningcore.Rpc;
 using Miningcore.Stratum;
 using Miningcore.Time;
 using NBitcoin;

src/Miningcore/Blockchain/Ergo/RPC/ErgoClient.cs

@@ -7407,13 +7407,13 @@ private string ConvertToString(object? value, System.Globalization.CultureInfo c
                 return converted == null ? string.Empty : converted;
             }
         }
-        else if (value is bool)
+        else if (value is bool b)
         {
-            return Convert.ToString((bool)value, cultureInfo).ToLowerInvariant();
+            return Convert.ToString(b, cultureInfo).ToLowerInvariant();
         }
-        else if (value is byte[])
+        else if (value is byte[] bytes)
         {
-            return Convert.ToBase64String((byte[]) value);
+            return Convert.ToBase64String(bytes);
         }
         else if (value.GetType().IsArray)
         {

src/Miningcore/Blockchain/Ethereum/EthereumJobManager.cs

@@ -23,6 +23,7 @@
 using static Miningcore.Util.ActionUtils;
 using System.Reactive;
 using Miningcore.Mining;
+using Miningcore.Rpc;
 using Newtonsoft.Json.Linq;
 
 namespace Miningcore.Blockchain.Ethereum;

src/Miningcore/Blockchain/Ethereum/EthereumPayoutHandler.cs

@@ -14,6 +14,7 @@
 using Miningcore.Persistence;
 using Miningcore.Persistence.Model;
 using Miningcore.Persistence.Repositories;
+using Miningcore.Rpc;
 using Miningcore.Time;
 using Miningcore.Util;
 using Newtonsoft.Json;

src/Miningcore/JsonRpc/JsonRpcRequest.cs

@@ -46,8 +46,8 @@ public JsonRpcRequest(string method, T parameters, object id)
 
     public TParam ParamsAs<TParam>() where TParam : class
     {
-        if(Params is JToken)
-            return ((JToken) Params)?.ToObject<TParam>();
+        if(Params is JToken token)
+            return token.ToObject<TParam>();
 
         return (TParam) Params;
     }

src/Miningcore/JsonRpc/RpcClient.cs → src/Miningcore/Rpc/RpcClient.cs

@@ -4,10 +4,10 @@
 using System.Net.WebSockets;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
-using System.Reactive.Threading.Tasks;
 using System.Text;
 using Miningcore.Configuration;
 using Miningcore.Extensions;
+using Miningcore.JsonRpc;
 using Miningcore.Messaging;
 using Miningcore.Notifications.Messages;
 using Miningcore.Util;
@@ -17,7 +17,7 @@
 using ZeroMQ;
 using Contract = Miningcore.Contracts.Contract;
 
-namespace Miningcore.JsonRpc;
+namespace Miningcore.Rpc;
 
 /// <summary>
 /// JsonRpc interface to blockchain node

src/Miningcore/JsonRpc/RpcRequest.cs → src/Miningcore/Rpc/RpcRequest.cs

@@ -1,4 +1,4 @@
-namespace Miningcore.JsonRpc;
+namespace Miningcore.Rpc;
 
 public record RpcRequest
 {

src/Miningcore/JsonRpc/RpcResponse.cs → src/Miningcore/Rpc/RpcResponse.cs

@@ -1,3 +1,5 @@
-namespace Miningcore.JsonRpc;
+using Miningcore.JsonRpc;
+
+namespace Miningcore.Rpc;
 
 public record RpcResponse<T>(T Response, JsonRpcError Error = null);

src/Miningcore/Util/BigRational.cs

@@ -145,9 +145,9 @@ int IComparable.CompareTo(object obj)
     {
         if(obj == null)
             return 1;
-        if(obj is not BigRational)
+        if(obj is not BigRational rational)
             throw new ArgumentException("Argument must be of type BigRational", "obj");
-        return Compare(this, (BigRational) obj);
+        return Compare(this, rational);
     }
 
     // IComparable<BigRational>

src/Miningcore/Util/ScheduledSubject.cs

@@ -56,7 +56,7 @@ public IDisposable Subscribe(IObserver<T> observer)
 
     public void Dispose()
     {
-        if(_subject is IDisposable)
-            ((IDisposable) _subject).Dispose();
+        if(_subject is IDisposable disposable)
+            disposable.Dispose();
     }
 }