Still trying to fix mining.subscribe.

bonesoul · Oct 4, 2014 · 51bce99 · 51bce99
1 parent a8f0ef9
commit 51bce99
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/CoiniumServ/Server/Mining/Stratum/StratumService.cs b/src/CoiniumServ/Server/Mining/Stratum/StratumService.cs
@@ -46,9 +46,10 @@ public class StratumService : JsonRpcService, IRpcService
         /// <summary>
         /// Subscribes a Miner to allow it to recieve work to begin hashing and submitting shares.
         /// </summary>
-        /// <param name="data">Miner Connection</param>
+        /// <param name="signature">software signature</param>
+        /// <param name="sessionId">optional parameter supplied by miners whom wants to reconnect and continue their old session</param>
         [JsonRpcMethod("mining.subscribe")]
-        public SubscribeResponse SubscribeMiner(string data = null)
+        public SubscribeResponse SubscribeMiner(string signature, string sessionId = null)
         {
             var context = (StratumContext) JsonRpcContext.Current().Value;         
 
@@ -58,7 +59,7 @@ public SubscribeResponse SubscribeMiner(string data = null)
                 ExtraNonce2Size = ExtraNonce.ExpectedExtraNonce2Size // Represents expected length of extranonce2 which will be generated by the miner. (http://mining.bitcoin.cz/stratum-mining)
             };
 
-            context.Miner.Subscribe(data);
+            context.Miner.Subscribe(signature);
 
             return response;
         }

diff --git a/src/Tests/Server/Mining/Stratum/StratumServiceTests.cs b/src/Tests/Server/Mining/Stratum/StratumServiceTests.cs
@@ -47,12 +47,12 @@ public StratumServiceTests()
         }
 
         [Fact]
-        public void MiningSubscribe_WithZeroParameters_ShouldSuccess()
+        public void MiningSubscribe_WithOutParameters_ShouldEqual()
         {
             _poolConfig.Coin.Name.Returns("zero-params");
             var service = new StratumService(_poolConfig, _shareManager);
 
-            const string request = @"{ 'id' : 1, 'method' : 'mining.subscribe', 'params' : [  ] }";
+            const string request = @"{ 'id' : 1, 'method' : 'mining.subscribe', 'params' : [] }";
             const string expectedResult = "{\"jsonrpc\":\"2.0\",\"result\":[[\"mining.set_difficulty\",\"0\",\"mining.notify\",\"0\"],\"00000000\",4],\"id\":1}";
 
             var task = JsonRpcProcessor.Process(_poolConfig.Coin.Name, request,_stratumContext);
@@ -62,7 +62,7 @@ public void MiningSubscribe_WithZeroParameters_ShouldSuccess()
         }
 
         [Fact]
-        public void MiningSubscribe_WithSignature_ShouldSuccess()
+        public void MiningSubscribe_WithSignature_ShouldEqual()
         {
             _poolConfig.Coin.Name.Returns("signature");
             var service = new StratumService(_poolConfig, _shareManager);
@@ -77,12 +77,12 @@ public void MiningSubscribe_WithSignature_ShouldSuccess()
         }
 
         [Fact]
-        public void MiningSubscribe_WithNonce_ShouldSuccess()
+        public void MiningSubscribe_WithSessionId_ShouldEqual()
         {
-            _poolConfig.Coin.Name.Returns("nonce");
+            _poolConfig.Coin.Name.Returns("session");
             var service = new StratumService(_poolConfig, _shareManager);
 
-            const string request = @"{ 'id' : 1, 'method' : 'mining.subscribe', 'params' : [ 'cgminer/3.7.2', 'aa' ] }";
+            const string request = @"{ 'id' : 1, 'method' : 'mining.subscribe', 'params' : [ 'cgminer/3.7.2', '02000000b507a8fd1ea2b7d9cdec867086f6935228aba1540154f83930377ea5a2e37108' ] }";
             const string expectedResult = "{\"jsonrpc\":\"2.0\",\"result\":[[\"mining.set_difficulty\",\"0\",\"mining.notify\",\"0\"],\"00000000\",4],\"id\":1}";
 
             var task = JsonRpcProcessor.Process(_poolConfig.Coin.Name, request, _stratumContext);