From 7fcefcdabc81f00489ff9d1c7f349892877167dd Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 26 May 2025 23:07:51 -0500 Subject: [PATCH 1/2] Fix obsolete tests --- .../SolanaRpcRateLimitingTests.cs | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/test/Solnet.Rpc.Test/SolanaRpcRateLimitingTests.cs b/test/Solnet.Rpc.Test/SolanaRpcRateLimitingTests.cs index 156e2328..a5997663 100644 --- a/test/Solnet.Rpc.Test/SolanaRpcRateLimitingTests.cs +++ b/test/Solnet.Rpc.Test/SolanaRpcRateLimitingTests.cs @@ -17,13 +17,13 @@ public void TestMaxSpeed_NoLimits() // allow unlimited fires instantly var limit = RateLimiter.Create(); Assert.IsTrue(limit.CanFire()); - limit.Fire(); - limit.Fire(); - limit.Fire(); - limit.Fire(); - limit.Fire(); - limit.Fire(); - limit.Fire(); + limit.WaitFireAsync().Wait(); + limit.WaitFireAsync().Wait(); + limit.WaitFireAsync().Wait(); + limit.WaitFireAsync().Wait(); + limit.WaitFireAsync().Wait(); + limit.WaitFireAsync().Wait(); + limit.WaitFireAsync().Wait(); } [TestMethod] @@ -32,15 +32,15 @@ public void TestMaxSpeed_WithinLimits() // allow unlimited fires instantly var limit = RateLimiter.Create().AllowHits(100).PerSeconds(10); Assert.IsTrue(limit.CanFire()); - limit.Fire(); - limit.Fire(); - limit.Fire(); - limit.Fire(); - limit.Fire(); - limit.Fire(); - limit.Fire(); - limit.Fire(); - limit.Fire(); + limit.WaitFireAsync().Wait(); + limit.WaitFireAsync().Wait(); + limit.WaitFireAsync().Wait(); + limit.WaitFireAsync().Wait(); + limit.WaitFireAsync().Wait(); + limit.WaitFireAsync().Wait(); + limit.WaitFireAsync().Wait(); + limit.WaitFireAsync().Wait(); + limit.WaitFireAsync().Wait(); } [TestMethod] @@ -53,19 +53,19 @@ public void TestTwoHitsPerSecond() Console.WriteLine(limit); Assert.IsTrue(limit.CanFire()); Console.WriteLine(limit); - limit.Fire(); + limit.WaitFireAsync().Wait(); Console.WriteLine(limit); - limit.Fire(); + limit.WaitFireAsync().Wait(); Console.WriteLine(limit); - limit.Fire(); + limit.WaitFireAsync().Wait(); Console.WriteLine(limit); - limit.Fire(); + limit.WaitFireAsync().Wait(); Console.WriteLine(limit); - limit.Fire(); + limit.WaitFireAsync().Wait(); Console.WriteLine(limit); - limit.Fire(); + limit.WaitFireAsync().Wait(); Console.WriteLine(limit); - limit.Fire(); + limit.WaitFireAsync().Wait(); Console.WriteLine(limit); // observe why this may break the build @@ -74,8 +74,8 @@ public void TestTwoHitsPerSecond() Console.WriteLine($"TimeCheck diff {finalTimeCheck.Subtract(twoSecondsLater).TotalMilliseconds}ms"); Assert.IsTrue(finalTimeCheck.Subtract(timeCheck).TotalMilliseconds > 2000, $"ExecTime diff {finalTimeCheck.Subtract(timeCheck).TotalMilliseconds}ms"); } - - + + [TestMethod] public async Task TestMaxSpeed_NoLimits_Async() { From f57f16e66d318ead29890653caa4017e7cf3192c Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 26 May 2025 23:57:17 -0500 Subject: [PATCH 2/2] use await --- .../SolanaRpcRateLimitingTests.cs | 53 +++++++++---------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/test/Solnet.Rpc.Test/SolanaRpcRateLimitingTests.cs b/test/Solnet.Rpc.Test/SolanaRpcRateLimitingTests.cs index a5997663..d97e8e1c 100644 --- a/test/Solnet.Rpc.Test/SolanaRpcRateLimitingTests.cs +++ b/test/Solnet.Rpc.Test/SolanaRpcRateLimitingTests.cs @@ -12,39 +12,39 @@ namespace Solnet.Rpc.Test public class SolanaRpcRateLimitingTests { [TestMethod] - public void TestMaxSpeed_NoLimits() + public async Task TestMaxSpeed_NoLimits() { // allow unlimited fires instantly var limit = RateLimiter.Create(); Assert.IsTrue(limit.CanFire()); - limit.WaitFireAsync().Wait(); - limit.WaitFireAsync().Wait(); - limit.WaitFireAsync().Wait(); - limit.WaitFireAsync().Wait(); - limit.WaitFireAsync().Wait(); - limit.WaitFireAsync().Wait(); - limit.WaitFireAsync().Wait(); + await limit.WaitFireAsync(); + await limit.WaitFireAsync(); + await limit.WaitFireAsync(); + await limit.WaitFireAsync(); + await limit.WaitFireAsync(); + await limit.WaitFireAsync(); + await limit.WaitFireAsync(); } [TestMethod] - public void TestMaxSpeed_WithinLimits() + public async Task TestMaxSpeed_WithinLimits() { // allow unlimited fires instantly var limit = RateLimiter.Create().AllowHits(100).PerSeconds(10); Assert.IsTrue(limit.CanFire()); - limit.WaitFireAsync().Wait(); - limit.WaitFireAsync().Wait(); - limit.WaitFireAsync().Wait(); - limit.WaitFireAsync().Wait(); - limit.WaitFireAsync().Wait(); - limit.WaitFireAsync().Wait(); - limit.WaitFireAsync().Wait(); - limit.WaitFireAsync().Wait(); - limit.WaitFireAsync().Wait(); + await limit.WaitFireAsync(); + await limit.WaitFireAsync(); + await limit.WaitFireAsync(); + await limit.WaitFireAsync(); + await limit.WaitFireAsync(); + await limit.WaitFireAsync(); + await limit.WaitFireAsync(); + await limit.WaitFireAsync(); + await limit.WaitFireAsync(); } [TestMethod] - public void TestTwoHitsPerSecond() + public async Task TestTwoHitsPerSecond() { // allow 2 hits per second var timeCheck = DateTime.UtcNow; @@ -53,19 +53,19 @@ public void TestTwoHitsPerSecond() Console.WriteLine(limit); Assert.IsTrue(limit.CanFire()); Console.WriteLine(limit); - limit.WaitFireAsync().Wait(); + await limit.WaitFireAsync(); Console.WriteLine(limit); - limit.WaitFireAsync().Wait(); + await limit.WaitFireAsync(); Console.WriteLine(limit); - limit.WaitFireAsync().Wait(); + await limit.WaitFireAsync(); Console.WriteLine(limit); - limit.WaitFireAsync().Wait(); + await limit.WaitFireAsync(); Console.WriteLine(limit); - limit.WaitFireAsync().Wait(); + await limit.WaitFireAsync(); Console.WriteLine(limit); - limit.WaitFireAsync().Wait(); + await limit.WaitFireAsync(); Console.WriteLine(limit); - limit.WaitFireAsync().Wait(); + await limit.WaitFireAsync(); Console.WriteLine(limit); // observe why this may break the build @@ -75,7 +75,6 @@ public void TestTwoHitsPerSecond() Assert.IsTrue(finalTimeCheck.Subtract(timeCheck).TotalMilliseconds > 2000, $"ExecTime diff {finalTimeCheck.Subtract(timeCheck).TotalMilliseconds}ms"); } - [TestMethod] public async Task TestMaxSpeed_NoLimits_Async() {