Fixed namespaces for GetworkService and StratumService.

Renamed HttpServiceContext.cs as GetworkContext.cs Renamed SocketServiceContext.cs as StratumContext.cs. GetworkContext does now strictly accept a IGetworkMiner. StratumContext does now strictly accept a IStratumMiner.
bonesoul · Oct 3, 2014 · 065cf73 · 065cf73
1 parent 75c740c
commit 065cf73
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 29 deletions.
diff --git a/src/CoiniumServ/CoiniumServ.csproj b/src/CoiniumServ/CoiniumServ.csproj
@@ -440,18 +440,18 @@
     <Compile Include="Server\Mining\Getwork\GetworkMiner.cs" />
     <Compile Include="Pools\PoolConfig.cs" />
     <Compile Include="Pools\PoolManager.cs" />
-    <Compile Include="Server\Mining\Getwork\Service\HttpServiceContext.cs" />
+    <Compile Include="Server\Mining\Getwork\GetworkContext.cs" />
     <Compile Include="Server\Mining\Getwork\GetworkServer.cs" />
     <Compile Include="Server\Mining\Getwork\GetworkServerConfig.cs" />
-    <Compile Include="Server\Mining\Getwork\Service\GetworkService.cs" />
+    <Compile Include="Server\Mining\Getwork\GetworkService.cs" />
     <Compile Include="Mining\IMiner.cs" />
-    <Compile Include="Server\Mining\Stratum\Service\SocketServiceContext.cs" />
+    <Compile Include="Server\Mining\Stratum\StratumContext.cs" />
     <Compile Include="Server\Commands\Server.cs" />
     <Compile Include="Server\Commands\Stats.cs" />
     <Compile Include="Server\Commands\Uptime.cs" />
     <Compile Include="Server\Commands\Version.cs" />
     <Compile Include="Server\Mining\Stratum\StratumMiner.cs" />
-    <Compile Include="Server\Mining\Stratum\Service\StratumService.cs" />
+    <Compile Include="Server\Mining\Stratum\StratumService.cs" />
     <Compile Include="Daemon\Responses\Getwork.cs" />
     <Compile Include="Container\Context\IApplicationContext.cs" />
     <Compile Include="Server\Mining\Getwork\HttpServer.cs" />

diff --git a/src/CoiniumServ/Container/Registries/ServerRegistry.cs b/src/CoiniumServ/Container/Registries/ServerRegistry.cs
@@ -24,10 +24,8 @@
 using CoiniumServ.Container.Context;
 using CoiniumServ.Server.Mining;
 using CoiniumServ.Server.Mining.Getwork;
-using CoiniumServ.Server.Mining.Getwork.Service;
 using CoiniumServ.Server.Mining.Service;
 using CoiniumServ.Server.Mining.Stratum;
-using CoiniumServ.Server.Mining.Stratum.Service;
 using CoiniumServ.Server.Web;
 
 namespace CoiniumServ.Container.Registries

diff --git a/...ing/Getwork/Service/HttpServiceContext.cs → ...v/Server/Mining/Getwork/GetworkContext.cs b/...ing/Getwork/Service/HttpServiceContext.cs → ...v/Server/Mining/Getwork/GetworkContext.cs
@@ -22,17 +22,16 @@
 #endregion
 
 using System.Net;
-using CoiniumServ.Mining;
 
-namespace CoiniumServ.Server.Mining.Getwork.Service
+namespace CoiniumServ.Server.Mining.Getwork
 {
-    public class HttpServiceContext
+    public class GetworkContext
     {
-        public IMiner Miner { get; private set; }
+        public IGetworkMiner Miner { get; private set; }
 
         public HttpListenerResponse Response { get; private set; }
 
-        public HttpServiceContext(IMiner miner, HttpListenerContext context)
+        public GetworkContext(IGetworkMiner miner, HttpListenerContext context)
         {
             Miner = miner;
             Response = context.Response;

diff --git a/src/CoiniumServ/Server/Mining/Getwork/GetworkMiner.cs b/src/CoiniumServ/Server/Mining/Getwork/GetworkMiner.cs
@@ -30,7 +30,6 @@
 using CoiniumServ.Logging;
 using CoiniumServ.Mining;
 using CoiniumServ.Pools;
-using CoiniumServ.Server.Mining.Getwork.Service;
 using CoiniumServ.Utils.Extensions;
 using Newtonsoft.Json;
 using Serilog;
@@ -97,7 +96,7 @@ public GetworkMiner(int id, IPool pool, IMinerManager minerManager)
                 var asyncData = ((JsonRpcStateAsync) callback);
                 var result = asyncData.Result;
                 var response = Encoding.UTF8.GetBytes(result);
-                var context = (HttpServiceContext) asyncData.AsyncState;
+                var context = (GetworkContext) asyncData.AsyncState;
 
                 context.Response.ContentType = "application/json";
                 context.Response.ContentEncoding = Encoding.UTF8;
@@ -125,7 +124,7 @@ public void Parse(HttpListenerContext httpContext)
                 using (var reader = new StreamReader(httpRequest.InputStream, Encoding.UTF8))
                 {
                     var line = reader.ReadToEnd();
-                    var rpcContext = new HttpServiceContext(this, httpContext);
+                    var rpcContext = new GetworkContext(this, httpContext);
 
                     _packetLogger.Verbose("rx: {0}", line.PrettifyJson());
 

diff --git a/.../Mining/Getwork/Service/GetworkService.cs → ...v/Server/Mining/Getwork/GetworkService.cs b/.../Mining/Getwork/Service/GetworkService.cs → ...v/Server/Mining/Getwork/GetworkService.cs
@@ -28,7 +28,7 @@
 using CoiniumServ.Shares;
 using Serilog;
 
-namespace CoiniumServ.Server.Mining.Getwork.Service
+namespace CoiniumServ.Server.Mining.Getwork
 {
     /// <summary>
     /// Getwork protocol implementation.
@@ -56,7 +56,7 @@ public class GetworkService : JsonRpcService, IRpcService
         [JsonRpcMethod("getwork")]
         public Daemon.Responses.Getwork Getwork(string data = null)
         {
-            var context = (HttpServiceContext) JsonRpcContext.Current().Value;
+            var context = (GetworkContext) JsonRpcContext.Current().Value;
             var miner = (IGetworkMiner) (context.Miner);
 
             // TODO: fixme! instead use jobmanager and sharemanager.

diff --git a/...g/Stratum/Service/SocketServiceContext.cs → ...v/Server/Mining/Stratum/StratumContext.cs b/...g/Stratum/Service/SocketServiceContext.cs → ...v/Server/Mining/Stratum/StratumContext.cs
@@ -21,15 +21,13 @@
 // 
 #endregion
 
-using CoiniumServ.Mining;
-
-namespace CoiniumServ.Server.Mining.Stratum.Service
+namespace CoiniumServ.Server.Mining.Stratum
 {
-    public class SocketServiceContext
+    public class StratumContext
     {
-        public IMiner Miner { get; private set; }
+        public IStratumMiner Miner { get; private set; }
 
-        public SocketServiceContext(IMiner miner)
+        public StratumContext(IStratumMiner miner)
         {
             Miner = miner;
         }

diff --git a/src/CoiniumServ/Server/Mining/Stratum/StratumMiner.cs b/src/CoiniumServ/Server/Mining/Stratum/StratumMiner.cs
@@ -34,7 +34,6 @@
 using CoiniumServ.Persistance.Layers;
 using CoiniumServ.Pools;
 using CoiniumServ.Server.Mining.Stratum.Errors;
-using CoiniumServ.Server.Mining.Stratum.Service;
 using CoiniumServ.Server.Mining.Stratum.Sockets;
 using CoiniumServ.Utils.Buffers;
 using CoiniumServ.Utils.Extensions;
@@ -227,7 +226,7 @@ private void ProcessRequest(string line)
         {
             try
             {
-                var rpcContext = new SocketServiceContext(this); // set the context.
+                var rpcContext = new StratumContext(this); // set the context.
 
                 _packetLogger.Verbose("rx: {0}", line.PrettifyJson());
 

diff --git a/.../Mining/Stratum/Service/StratumService.cs → ...v/Server/Mining/Stratum/StratumService.cs b/.../Mining/Stratum/Service/StratumService.cs → ...v/Server/Mining/Stratum/StratumService.cs
@@ -28,7 +28,7 @@
 using CoiniumServ.Server.Mining.Stratum.Responses;
 using CoiniumServ.Shares;
 
-namespace CoiniumServ.Server.Mining.Stratum.Service
+namespace CoiniumServ.Server.Mining.Stratum
 {
     /// <summary>
     /// Stratum protocol implementation.
@@ -50,7 +50,7 @@ public class StratumService : JsonRpcService, IRpcService
         [JsonRpcMethod("mining.subscribe")]
         public SubscribeResponse SubscribeMiner(string signature)
         {
-            var context = (SocketServiceContext) JsonRpcContext.Current().Value;
+            var context = (StratumContext) JsonRpcContext.Current().Value;
             var miner = (IStratumMiner)(context.Miner);            
 
             var response = new SubscribeResponse
@@ -72,7 +72,7 @@ public SubscribeResponse SubscribeMiner(string signature)
         [JsonRpcMethod("mining.authorize")]
         public bool AuthorizeMiner(string user, string password)
         {
-            var context = (SocketServiceContext)JsonRpcContext.Current().Value;
+            var context = (StratumContext)JsonRpcContext.Current().Value;
             var miner = (IStratumMiner)(context.Miner);
 
             return miner.Authenticate(user, password);
@@ -89,7 +89,7 @@ public bool AuthorizeMiner(string user, string password)
         [JsonRpcMethod("mining.submit")]
         public bool SubmitWork(string user, string jobId, string extraNonce2, string nTime, string nonce)
         {
-            var context = (SocketServiceContext)JsonRpcContext.Current().Value;
+            var context = (StratumContext)JsonRpcContext.Current().Value;
             var miner = (IStratumMiner)(context.Miner);
 
             return _shareManager.ProcessShare(miner, jobId, extraNonce2, nTime, nonce).IsValid;

diff --git a/src/Tests/CoiniumServ.Tests.csproj b/src/Tests/CoiniumServ.Tests.csproj
@@ -109,7 +109,9 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Server\Mining\Stratum\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">