⬆️ updated packages.

src/Core/Hypepool.Common/Hypepool.Common.csproj

@@ -29,7 +29,7 @@
 
   <ItemGroup>
     <PackageReference Include="NetUV.Core" Version="0.1.140" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
     <PackageReference Include="Serilog" Version="2.6.0" />
     <PackageReference Include="System.Reactive" Version="3.1.1" />
     <PackageReference Include="xunit.analyzers" Version="0.8.0" />

src/Core/Hypepool.Core/Hypepool.Core.csproj

@@ -33,7 +33,7 @@
     <PackageReference Include="Serilog" Version="2.6.0" />
     <PackageReference Include="Serilog.Enrichers.Thread" Version="3.0.0" />
     <PackageReference Include="Serilog.Sinks.ColoredConsole" Version="3.0.1" />
-    <PackageReference Include="Stashbox" Version="2.5.7" />
+    <PackageReference Include="Stashbox" Version="2.5.8" />
     <PackageReference Include="System.Reactive" Version="3.1.1" />
     <PackageReference Include="xunit.analyzers" Version="0.8.0" />
   </ItemGroup>

src/Core/Hypepool.Core/Internals/Factories/Core/CoreFactory.cs

@@ -26,7 +26,6 @@
 using Hypepool.Core.Core;
 using Hypepool.Core.Utils.Logging;
 using Stashbox;
-using Stashbox.Infrastructure;
 
 namespace Hypepool.Core.Internals.Factories.Core
 {

src/Core/Hypepool.Core/Internals/Factories/Pool/PoolFactory.cs

@@ -27,7 +27,6 @@
 using System.Linq;
 using Hypepool.Common.Pools;
 using Stashbox;
-using Stashbox.Infrastructure;
 
 namespace Hypepool.Core.Internals.Factories.Pool
 {

src/Core/Hypepool.Core/Internals/Factories/Server/ServerFactory.cs

@@ -26,7 +26,6 @@
 using Hypepool.Common.Factories.Server;
 using Hypepool.Common.Stratum;
 using Stashbox;
-using Stashbox.Infrastructure;
 
 namespace Hypepool.Core.Internals.Factories.Server
 {

src/Tests/Hypepool.Benchmarks/.gitignore

@@ -0,0 +1 @@
+BenchmarkDotNet.Artifacts/

src/Tests/Hypepool.Common.Tests/Hypepool.Common.Tests.csproj

@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="4.19.4" />
+    <PackageReference Include="FluentAssertions" Version="5.1.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.analyzers" Version="0.8.0" />

src/Tests/Hypepool.Common.Tests/Mining/Jobs/JobCounterTests.cs

@@ -45,8 +45,8 @@ public JobCounterTests()
         [Fact]
         public void ShouldBeIncremented()
         {
-            _jobCounter.GetNext().ShouldBeEquivalentTo(1);
-            _jobCounter.GetNext().ShouldBeEquivalentTo(2);
+            _jobCounter.GetNext().Should().Be(1);
+            _jobCounter.GetNext().Should().Be(2);
         }
 
         [Fact]
@@ -58,13 +58,13 @@ public void ShouldResetBackAfterMaxValue()
 
             // set it to int.MaxValue - 1
             last.SetValue(_jobCounter, int.MaxValue - 1);
-            last.GetValue(_jobCounter).ShouldBeEquivalentTo(int.MaxValue - 1);
+            last.GetValue(_jobCounter).Should().Be(int.MaxValue - 1);
 
             // GetNext() and should be int.MaxValue now.
-            _jobCounter.GetNext().ShouldBeEquivalentTo(int.MaxValue);
+            _jobCounter.GetNext().Should().Be(int.MaxValue);
 
             // another GetNext() and should reset back to 1 now.
-            _jobCounter.GetNext().ShouldBeEquivalentTo(1);
+            _jobCounter.GetNext().Should().Be(1);
         }
     }
 }

src/Tests/Hypepool.Core.Tests/Core/Internals/ContainerTests.cs

@@ -37,7 +37,7 @@ public class ContainerTests
         public void VerifyContainer()
         {
             Action act = () => new Bootstrapper(); // verify the container.
-            act.ShouldNotThrow();
+            act.Should().NotThrow();
         }
     }
 }

src/Tests/Hypepool.Core.Tests/Hypepool.Core.Tests.csproj

@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="4.19.4" />
+    <PackageReference Include="FluentAssertions" Version="5.1.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.analyzers" Version="0.8.0" />

src/Tests/Hypepool.Core.Tests/Utils/Buffers/PooledLineBufferTests.cs

@@ -49,8 +49,8 @@ public void PooledLineBuffer_Partial_Line()
                 (src, dst, count) => Array.Copy(src, 0, dst, 0, count),
                 (x) => recvCount++, (ex) => errCount++);
 
-            recvCount.ShouldBeEquivalentTo(0);
-            errCount.ShouldBeEquivalentTo(0);
+            recvCount.Should().Be(0);
+            errCount.Should().Be(0);
         }
 
         [Fact]
@@ -72,8 +72,8 @@ public void PooledLineBuffer_Partial_Line_Double()
                 (src, dst, count) => Array.Copy(src, 0, dst, 0, count),
                 (x) => recvCount++, (ex) => errCount++);
 
-            recvCount.ShouldBeEquivalentTo(0);
-            errCount.ShouldBeEquivalentTo(0);
+            recvCount.Should().Be(0);
+            errCount.Should().Be(0);
         }
 
         [Fact]
@@ -100,9 +100,9 @@ public void PooledLineBuffer_Partial_Line_Double_With_NewLine()
                     result = GetString(x);
                 }, (ex) => errCount++);
 
-            recvCount.ShouldBeEquivalentTo(1);
-            errCount.ShouldBeEquivalentTo(0);
-            result.ShouldBeEquivalentTo("deadbeef");
+            recvCount.Should().Be(1);
+            errCount.Should().Be(0);
+            result.Should().Be("deadbeef");
         }
 
         [Fact]
@@ -129,9 +129,9 @@ public void PooledLineBuffer_Partial_Line_Double_With_NewLine_With_Leading_NewLi
                     result = GetString(x);
                 }, (ex) => errCount++);
 
-            recvCount.ShouldBeEquivalentTo(1);
-            errCount.ShouldBeEquivalentTo(0);
-            result.ShouldBeEquivalentTo("deadbeef");
+            recvCount.Should().Be(1);
+            errCount.Should().Be(0);
+            result.Should().Be("deadbeef");
         }
 
         [Fact]
@@ -158,9 +158,9 @@ public void PooledLineBuffer_Partial_Line_Double_With_NewLine_With_Trailing_NewL
                     result = GetString(x);
                 }, (ex) => errCount++);
 
-            recvCount.ShouldBeEquivalentTo(1);
-            errCount.ShouldBeEquivalentTo(0);
-            result.ShouldBeEquivalentTo("deadbeef");
+            recvCount.Should().Be(1);
+            errCount.Should().Be(0);
+            result.Should().Be("deadbeef");
         }
 
         [Fact]
@@ -179,8 +179,8 @@ public void PooledLineBuffer_Partial_Dont_Emit_Empty_Lines()
                     recvCount++;
                 }, (ex) => errCount++);
 
-            recvCount.ShouldBeEquivalentTo(0);
-            errCount.ShouldBeEquivalentTo(0);
+            recvCount.Should().Be(0);
+            errCount.Should().Be(0);
         }
 
         [Fact]
@@ -199,8 +199,8 @@ public void PooledLineBuffer_Partial_Enforce_Limits()
                     recvCount++;
                 }, (ex) => errCount++);
 
-            recvCount.ShouldBeEquivalentTo(0);
-            errCount.ShouldBeEquivalentTo(1);
+            recvCount.Should().Be(0);
+            errCount.Should().Be(1);
         }
 
         [Fact]
@@ -219,8 +219,8 @@ public void PooledLineBuffer_Partial_Enforce_Limits_Queued()
                     recvCount++;
                 }, (ex) => errCount++);
 
-            recvCount.ShouldBeEquivalentTo(0);
-            errCount.ShouldBeEquivalentTo(0);
+            recvCount.Should().Be(0);
+            errCount.Should().Be(0);
 
             buf = GetBuffer("bee");
 
@@ -231,8 +231,8 @@ public void PooledLineBuffer_Partial_Enforce_Limits_Queued()
                     recvCount++;
                 }, (ex) => errCount++);
 
-            recvCount.ShouldBeEquivalentTo(0);
-            errCount.ShouldBeEquivalentTo(1);
+            recvCount.Should().Be(0);
+            errCount.Should().Be(1);
         }
 
         [Fact]
@@ -253,9 +253,9 @@ public void PooledLineBuffer_Single_Line()
                     result = GetString(x);
                 }, (ex) => errCount++);
 
-            recvCount.ShouldBeEquivalentTo(1);
-            errCount.ShouldBeEquivalentTo(0);
-            result.ShouldBeEquivalentTo("dead");
+            recvCount.Should().Be(1);
+            errCount.Should().Be(0);
+            result.Should().Be("dead");
         }
 
         [Fact]
@@ -274,12 +274,12 @@ public void PooledLineBuffer_Multi_Line_Batch()
                     results.Add(GetString(x));
                 }, (ex) => errCount++);
 
-            results.Count.ShouldBeEquivalentTo(3);
-            errCount.ShouldBeEquivalentTo(0);
+            results.Count.Should().Be(3);
+            errCount.Should().Be(0);
 
-            results[0].ShouldBeEquivalentTo("dead");
-            results[1].ShouldBeEquivalentTo("beef");
-            results[2].ShouldBeEquivalentTo("c0de");
+            results[0].Should().Be("dead");
+            results[1].Should().Be("beef");
+            results[2].Should().Be("c0de");
         }
 
         [Fact]
@@ -316,9 +316,9 @@ public void PooledLineBuffer_Single_Characters()
                     results.Add(GetString(x));
                 }, (ex) => errCount++);
 
-            results.Count.ShouldBeEquivalentTo(1);
-            errCount.ShouldBeEquivalentTo(0);
-            results[0].ShouldBeEquivalentTo("abc");
+            results.Count.Should().Be(1);
+            errCount.Should().Be(0);
+            results[0].Should().Be("abc");
         }
 
         [Fact]
@@ -355,11 +355,11 @@ public void PooledLineBuffer_Single_Character_Lines()
                     results.Add(GetString(x));
                 }, (ex) => errCount++);
 
-            results.Count.ShouldBeEquivalentTo(3);
-            errCount.ShouldBeEquivalentTo(0);
-            results[0].ShouldBeEquivalentTo("a");
-            results[1].ShouldBeEquivalentTo("b");
-            results[2].ShouldBeEquivalentTo("c");
+            results.Count.Should().Be(3);
+            errCount.Should().Be(0);
+            results[0].Should().Be("a");
+            results[1].Should().Be("b");
+            results[2].Should().Be("c");
         }
 
         [Fact]
@@ -378,9 +378,9 @@ public void PooledLineBuffer_Combo1()
                     results.Add(GetString(x));
                 }, (ex) => errCount++);
 
-            results.Count.ShouldBeEquivalentTo(1);
-            errCount.ShouldBeEquivalentTo(0);
-            results[0].ShouldBeEquivalentTo("dead");
+            results.Count.Should().Be(1);
+            errCount.Should().Be(0);
+            results[0].Should().Be("dead");
         }
 
         [Fact]
@@ -408,10 +408,10 @@ public void PooledLineBuffer_Combo2()
                     results.Add(GetString(x));
                 }, (ex) => errCount++);
 
-            results.Count.ShouldBeEquivalentTo(2);
-            errCount.ShouldBeEquivalentTo(0);
-            results[0].ShouldBeEquivalentTo("dead");
-            results[1].ShouldBeEquivalentTo("beefc0de");
+            results.Count.Should().Be(2);
+            errCount.Should().Be(0);
+            results[0].Should().Be("dead");
+            results[1].Should().Be("beefc0de");
         }
 
         [Fact]
@@ -448,11 +448,11 @@ public void PooledLineBuffer_Combo3()
                     results.Add(GetString(x));
                 }, (ex) => errCount++);
 
-            results.Count.ShouldBeEquivalentTo(3);
-            errCount.ShouldBeEquivalentTo(0);
-            results[0].ShouldBeEquivalentTo("dead");
-            results[1].ShouldBeEquivalentTo("beefc0defeed");
-            results[2].ShouldBeEquivalentTo("babe");
+            results.Count.Should().Be(3);
+            errCount.Should().Be(0);
+            results[0].Should().Be("dead");
+            results[1].Should().Be("beefc0defeed");
+            results[2].Should().Be("babe");
         }
 
         private byte[] GetBuffer(string str)

src/Tests/Hypepool.Monero.Tests/Hypepool.Monero.Tests.csproj

@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="4.19.4" />
+    <PackageReference Include="FluentAssertions" Version="5.1.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="Microsoft.Reactive.Testing" Version="3.1.1" />
     <PackageReference Include="NSubstitute" Version="3.1.0" />

src/Tests/Hypepool.Monero.Tests/JobManager/JobManagerTests.cs

@@ -79,23 +79,23 @@ public async void ShouldGetANewJobOnDifferentBlocktemplates()
             // check first job.
             await _jobManager.JobQueue.Take(1).Do(job =>
             {
-                job.BlockTemplate.Blob.ShouldBeEquivalentTo("07079ccdc1d3053b4aff4fdac0424b58a69234796f1e572eea2650cb4a6c19aa03c17308d73d5b0000000002e3b64201ffa7b64201b3be90f18de9010258f3cdf062d631c578597ad4aa00bb6e99bbbdc816fa295286ea956c2d15e1cf2b0109d8ec8c47fb41668d69ef2ce3764a906285bbab66a127247f627b939380ddc7020800000000000000000000");
-                job.BlockTemplate.Difficulty.ShouldBeEquivalentTo(23096);
-                job.BlockTemplate.Height.ShouldBeEquivalentTo(1088295);
-                job.BlockTemplate.PreviousBlockhash.ShouldBeEquivalentTo("3b4aff4fdac0424b58a69234796f1e572eea2650cb4a6c19aa03c17308d73d5b");
-                job.BlockTemplate.ReservedOffset.ShouldBeEquivalentTo(129);
-                job.BlockTemplate.Status.ShouldBeEquivalentTo("OK");
+                job.BlockTemplate.Blob.Should().Be("07079ccdc1d3053b4aff4fdac0424b58a69234796f1e572eea2650cb4a6c19aa03c17308d73d5b0000000002e3b64201ffa7b64201b3be90f18de9010258f3cdf062d631c578597ad4aa00bb6e99bbbdc816fa295286ea956c2d15e1cf2b0109d8ec8c47fb41668d69ef2ce3764a906285bbab66a127247f627b939380ddc7020800000000000000000000");
+                job.BlockTemplate.Difficulty.Should().Be(23096);
+                job.BlockTemplate.Height.Should().Be(1088295);
+                job.BlockTemplate.PreviousBlockhash.Should().Be("3b4aff4fdac0424b58a69234796f1e572eea2650cb4a6c19aa03c17308d73d5b");
+                job.BlockTemplate.ReservedOffset.Should().Be(129);
+                job.BlockTemplate.Status.Should().Be("OK");
             });
 
             // check the second job
             await _jobManager.JobQueue.Take(1).Do(job =>
             {
-                job.BlockTemplate.Blob.ShouldBeEquivalentTo("0707b0cfc1d305a6a0d38480cde292cbcd372835fb8d57ff8285b5334c724f610599d379c5499d0000000002e4b64201ffa8b64201ee86ece98de90102d287d0af34a8c9dc624cf4a7495f673782d9a323b1d22dec71b069af84c072672b013b54f7d869b695fd5e5fa05ddf49e971f511440b86ff42ce836283d207777442020800000000000000000000");
-                job.BlockTemplate.Difficulty.ShouldBeEquivalentTo(23087);
-                job.BlockTemplate.Height.ShouldBeEquivalentTo(1088296);
-                job.BlockTemplate.PreviousBlockhash.ShouldBeEquivalentTo("a6a0d38480cde292cbcd372835fb8d57ff8285b5334c724f610599d379c5499d");
-                job.BlockTemplate.ReservedOffset.ShouldBeEquivalentTo(129);
-                job.BlockTemplate.Status.ShouldBeEquivalentTo("OK");
+                job.BlockTemplate.Blob.Should().Be("0707b0cfc1d305a6a0d38480cde292cbcd372835fb8d57ff8285b5334c724f610599d379c5499d0000000002e4b64201ffa8b64201ee86ece98de90102d287d0af34a8c9dc624cf4a7495f673782d9a323b1d22dec71b069af84c072672b013b54f7d869b695fd5e5fa05ddf49e971f511440b86ff42ce836283d207777442020800000000000000000000");
+                job.BlockTemplate.Difficulty.Should().Be(23087);
+                job.BlockTemplate.Height.Should().Be(1088296);
+                job.BlockTemplate.PreviousBlockhash.Should().Be("a6a0d38480cde292cbcd372835fb8d57ff8285b5334c724f610599d379c5499d");
+                job.BlockTemplate.ReservedOffset.Should().Be(129);
+                job.BlockTemplate.Status.Should().Be("OK");
             });
         }
 
@@ -108,17 +108,17 @@ public async void ShouldNotGetANewJobOnSameBlockTemplate()
             // check first response.
             await _jobManager.JobQueue.Take(1).Do(job =>
             {
-                job.BlockTemplate.Blob.ShouldBeEquivalentTo("07079ccdc1d3053b4aff4fdac0424b58a69234796f1e572eea2650cb4a6c19aa03c17308d73d5b0000000002e3b64201ffa7b64201b3be90f18de9010258f3cdf062d631c578597ad4aa00bb6e99bbbdc816fa295286ea956c2d15e1cf2b0109d8ec8c47fb41668d69ef2ce3764a906285bbab66a127247f627b939380ddc7020800000000000000000000");
-                job.BlockTemplate.Difficulty.ShouldBeEquivalentTo(23096);
-                job.BlockTemplate.Height.ShouldBeEquivalentTo(1088295);
-                job.BlockTemplate.PreviousBlockhash.ShouldBeEquivalentTo("3b4aff4fdac0424b58a69234796f1e572eea2650cb4a6c19aa03c17308d73d5b");
-                job.BlockTemplate.ReservedOffset.ShouldBeEquivalentTo(129);
-                job.BlockTemplate.Status.ShouldBeEquivalentTo("OK");
+                job.BlockTemplate.Blob.Should().Be("07079ccdc1d3053b4aff4fdac0424b58a69234796f1e572eea2650cb4a6c19aa03c17308d73d5b0000000002e3b64201ffa7b64201b3be90f18de9010258f3cdf062d631c578597ad4aa00bb6e99bbbdc816fa295286ea956c2d15e1cf2b0109d8ec8c47fb41668d69ef2ce3764a906285bbab66a127247f627b939380ddc7020800000000000000000000");
+                job.BlockTemplate.Difficulty.Should().Be(23096);
+                job.BlockTemplate.Height.Should().Be(1088295);
+                job.BlockTemplate.PreviousBlockhash.Should().Be("3b4aff4fdac0424b58a69234796f1e572eea2650cb4a6c19aa03c17308d73d5b");
+                job.BlockTemplate.ReservedOffset.Should().Be(129);
+                job.BlockTemplate.Status.Should().Be("OK");
             });
 
             // we should not even get a second job as daemon will just reply with same blocktemplates.            
             Func<Task> call = async () => { await _jobManager.JobQueue.Take(1).Timeout(TimeSpan.FromMilliseconds(100)); };
-            call.ShouldThrow<TimeoutException>(); // as we won't get a new job, the call should timeout with an expection..
+            call.Should().Throw<TimeoutException>(); // as we won't get a new job, the call should timeout with an expection..
         }
     }