Remove obsolete StratumShare object. Fixes oliverw#1536

JJPool · Feb 1, 2023 · f4af411 · f4af411
1 parent 6c797ab
commit f4af411
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 16 deletions.
diff --git a/src/Miningcore/Blockchain/Bitcoin/BitcoinPool.cs b/src/Miningcore/Blockchain/Bitcoin/BitcoinPool.cs
@@ -185,7 +185,7 @@ protected virtual async Task OnSubmitAsync(StratumConnection connection, Timesta
             await connection.RespondAsync(true, request.Id);
 
             // publish
-            messageBus.SendMessage(new StratumShare(connection, share));
+            messageBus.SendMessage(share);
 
             // telemetry
             PublishTelemetry(TelemetryCategory.Share, clock.Now - tsRequest.Timestamp.UtcDateTime, true);

diff --git a/src/Miningcore/Blockchain/Cryptonote/CryptonotePool.cs b/src/Miningcore/Blockchain/Cryptonote/CryptonotePool.cs
@@ -249,7 +249,7 @@ private async Task OnSubmitAsync(StratumConnection connection, Timestamped<JsonR
             await connection.RespondAsync(new CryptonoteResponseBase(), request.Id);
 
             // publish
-            messageBus.SendMessage(new StratumShare(connection, share));
+            messageBus.SendMessage(share);
 
             // telemetry
             PublishTelemetry(TelemetryCategory.Share, clock.Now - tsRequest.Timestamp.UtcDateTime, true);

diff --git a/src/Miningcore/Blockchain/Equihash/EquihashPool.cs b/src/Miningcore/Blockchain/Equihash/EquihashPool.cs
@@ -243,7 +243,7 @@ protected virtual async Task OnSubmitAsync(StratumConnection connection, Timesta
             await connection.RespondAsync(true, request.Id);
 
             // publish
-            messageBus.SendMessage(new StratumShare(connection, share));
+            messageBus.SendMessage(share);
 
             // telemetry
             PublishTelemetry(TelemetryCategory.Share, clock.Now - tsRequest.Timestamp.UtcDateTime, true);

diff --git a/src/Miningcore/Blockchain/Ergo/ErgoPool.cs b/src/Miningcore/Blockchain/Ergo/ErgoPool.cs
@@ -189,7 +189,7 @@ protected virtual async Task OnSubmitAsync(StratumConnection connection, Timesta
             await connection.RespondAsync(true, request.Id);
 
             // publish
-            messageBus.SendMessage(new StratumShare(connection, share));
+            messageBus.SendMessage(share);
 
             // telemetry
             PublishTelemetry(TelemetryCategory.Share, clock.Now - tsRequest.Timestamp.UtcDateTime, true);

diff --git a/src/Miningcore/Blockchain/Ethereum/EthereumPool.cs b/src/Miningcore/Blockchain/Ethereum/EthereumPool.cs
@@ -208,7 +208,7 @@ private async Task OnSubmitAsync(StratumConnection connection, Timestamped<JsonR
             await connection.RespondAsync(true, request.Id);
 
             // publish
-            messageBus.SendMessage(new StratumShare(connection, share));
+            messageBus.SendMessage(share);
 
             // telemetry
             PublishTelemetry(TelemetryCategory.Share, clock.Now - tsRequest.Timestamp.UtcDateTime, true);

diff --git a/src/Miningcore/Mining/ShareReceiver.cs b/src/Miningcore/Mining/ShareReceiver.cs
@@ -283,7 +283,7 @@ private void ProcessMessage(string url, ZMessage msg)
         // store
         share.PoolId = topic;
         share.Created = clock.Now;
-        messageBus.SendMessage(new StratumShare(null, share));
+        messageBus.SendMessage(share);
 
         // update poolstats from shares
         if(poolContext != null)

diff --git a/src/Miningcore/Mining/ShareRecorder.cs b/src/Miningcore/Mining/ShareRecorder.cs
@@ -323,10 +323,10 @@ protected override Task ExecuteAsync(CancellationToken ct)
     {
         logger.Info(() => "Online");
 
-        return messageBus.Listen<StratumShare>()
+        return messageBus.Listen<Share>()
             .ObserveOn(TaskPoolScheduler.Default)
-            .Where(x => x.Share != null)
-            .Select(x => x.Share)
+            .Where(x => x != null)
+            .Select(x => x)
             .Buffer(TimeSpan.FromSeconds(5), 250)
             .Where(shares => shares.Any())
             .Select(shares => Observable.FromAsync(() =>

diff --git a/src/Miningcore/Mining/ShareRelay.cs b/src/Miningcore/Mining/ShareRelay.cs
@@ -101,7 +101,7 @@ private void CheckQueueBacklog()
 
     public Task StartAsync(CancellationToken ct)
     {
-        messageBus.Listen<StratumShare>().Subscribe(x => queue.Add(x.Share, ct));
+        messageBus.Listen<Share>().Subscribe(x => queue.Add(x, ct));
 
         pubSocket = new ZSocket(ZSocketType.PUB);
 

diff --git a/src/Miningcore/Mining/StratumShare.cs b/src/Miningcore/Mining/StratumShare.cs