trakx · emanuelgaspar · Nov 2, 2023 · Apr 14, 2022 · Apr 18, 2022 · Apr 18, 2022
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -12,6 +12,6 @@ jobs:
     if: ${{ github.actor == 'dependabot[bot]' }}
     steps:
       - name: Merge non major updates
-        uses: trakx/github-actions/dependabot-automerge@v10.0.14
+        uses: trakx/github-actions/dependabot-automerge@v10.0.26
         with:
           githubToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
@@ -57,7 +57,7 @@ jobs:
 
       - name: Build and publish nuget packages
         id: publish
-        uses: trakx/github-actions/publish-nuget@v10.0.14
+        uses: trakx/github-actions/publish-nuget@v10.0.26
         with:
           packageReadonlyPat: ${{secrets.TRAKX_BOT_READONLY_PAT}}
           githubToken: ${{secrets.GITHUB_TOKEN}}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: Test and cover solutions
         id: test
-        uses: trakx/github-actions/test-dotnet@v10.0.14
+        uses: trakx/github-actions/test-dotnet@v10.0.26
         with:
           packageReadonlyPat: ${{secrets.TRAKX_BOT_READONLY_PAT}}
           codacyToken: ${{secrets.CODACY_TOKEN}}

diff --git a/src/Trakx.CryptoCompare.ApiClient.Tests/Integration/Rest/Clients/PriceClientTests.cs b/src/Trakx.CryptoCompare.ApiClient.Tests/Integration/Rest/Clients/PriceClientTests.cs
@@ -1,4 +1,6 @@
-using System.Threading.Tasks;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
 using FluentAssertions;
 using Xunit;
 
@@ -38,7 +40,8 @@ public async Task CanCallGenerateCustomAverageEndpoint()
             Assert.NotNull(result);
         }
 
-        [Fact] public async Task CanCallWithLargeNumberOfFSymbols()
+        [Fact]
+        public async Task CanCallWithLargeNumberOfFSymbols()
         {
             var symbols = new[]
             {
@@ -50,8 +53,13 @@ [Fact] public async Task CanCallWithLargeNumberOfFSymbols()
                 "srm", "cake", "luna"
             };
             var result = await CryptoCompareClient.Prices.MultipleSymbolsPriceAsync(symbols, new[] { "USD", "EUR" });
-            result.Count.Should().Be(symbols.Length);
-            Assert.NotNull(result);
+
+            result.Should().NotBeEmpty();
+
+            var missingKeys = symbols.Except(result.Keys, StringComparer.OrdinalIgnoreCase).Order().ToList();
+
+            var maximumMissingAllowed = symbols.Length * 10 / 100; // 10% missing
+            missingKeys.Count.Should().BeLessThanOrEqualTo(maximumMissingAllowed);
         }
     }
 }
diff --git a/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj b/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj
@@ -16,17 +16,17 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="GitHubActionsTestLogger" Version="2.2.1">
+        <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
-        <PackageReference Include="NSubstitute" Version="5.0.0" />
-        <PackageReference Include="Trakx.Common.Testing.Documentation" Version="0.2.2" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="NSubstitute" Version="5.1.0" />
+        <PackageReference Include="Trakx.Common.Testing.Documentation" Version="0.5.1" />
+        <PackageReference Include="xunit" Version="2.6.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/src/Trakx.CryptoCompare.ApiClient.Tests/Unit/Rest/Helpers/CheckTest.cs b/src/Trakx.CryptoCompare.ApiClient.Tests/Unit/Rest/Helpers/CheckTest.cs
@@ -1,12 +1,13 @@
 using System;
+using FluentAssertions;
 using Trakx.CryptoCompare.ApiClient.Rest.Helpers;
 using Xunit;
 
 namespace Trakx.CryptoCompare.ApiClient.Tests.Unit.Rest.Helpers
 {
     public class CheckTest
     {
-        public static string Blah = nameof(Blah);
+        internal const string Blah = nameof(Blah);
 
         /// <summary>
         /// NotNullOrWhiteSpace should not throw ArgumentNullException when string is not null.
@@ -27,7 +28,7 @@ public void NotNullOrWhiteSpaceShouldNotThrowArgumentNullExceptionWhenStringIsNo
         public void NotNullOrWhiteSpaceShouldThrowArgumentNullExceptionWhenStringIsNullOrEmptyOrWhitespace(string value)
         {
             var exception = Assert.Throws<ArgumentNullException>(() => Check.NotNullOrWhiteSpace(value, Blah));
-            Assert.Equal(exception.ParamName, Blah);
+            exception.ParamName.Should().Be(Blah);
         }
 
         /// <summary>
@@ -46,7 +47,7 @@ public void NotNullShouldNotThrowArgumentNullExceptionWhenObjectIsNotNull()
         public void NotNullShouldThrowArgumentNullExceptionWhenObjectIsNull()
         {
             var exception = Assert.Throws<ArgumentNullException>(() => Check.NotNull<int?>(null, Blah));
-            Assert.Equal(exception.ParamName, Blah);
+            exception.ParamName.Should().Be(Blah);
         }
     }
 }
diff --git a/src/Trakx.CryptoCompare.ApiClient.Tests/Unit/ServiceConfigurationTests.cs b/src/Trakx.CryptoCompare.ApiClient.Tests/Unit/ServiceConfigurationTests.cs
@@ -1,4 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
+using FluentAssertions;
+using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 
 namespace Trakx.CryptoCompare.ApiClient.Tests.Unit
@@ -13,7 +14,10 @@ public void Services_should_be_built()
             var serviceCollection = new ServiceCollection();
             serviceCollection.AddCryptoCompareClient(configuration);
             serviceCollection.AddLogging();
-            var serviceProvider = serviceCollection.BuildServiceProvider();
+
+            var action = () => _ = serviceCollection.BuildServiceProvider();
+
+            action.Should().NotThrow();
         }
     }
 }
diff --git a/...CryptoCompare.ApiClient.Websocket.Tests/Integration/CryptoCompareWebsocketHandlerTests.cs b/...CryptoCompare.ApiClient.Websocket.Tests/Integration/CryptoCompareWebsocketHandlerTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.Linq;
 using System.Reactive.Linq;
 using System.Reactive.Threading.Tasks;
@@ -40,12 +39,6 @@ public static IServiceProvider CreateServiceProvider()
             return serviceCollection.BuildServiceProvider();
         }
 
-        public void Dispose()
-        {
-            _serviceScope.Dispose();
-        }
-
-
         private async Task<T> GetResult<T>(string subStr, int bufferSeconds = 10)
             where T : InboundMessageBase
         {
@@ -66,10 +59,9 @@ private async Task<T> GetResult<T>(string subStr, int bufferSeconds = 10)
         public async Task Should_be_able_to_get_full_top_tier_volume_subscriptions()
         {
             var subscriptionString = CryptoCompareSubscriptionFactory.GetFullTopTierVolumeSubscriptionStr("btc");
-            var result = await GetResult<TopTierFullVolume>(subscriptionString).ConfigureAwait(false);
+            var result = await GetResult<TopTierFullVolume>(subscriptionString);
             result!.Symbol.Should().Be("BTC");
-            decimal.TryParse(result.Volume, CultureInfo.InvariantCulture, out decimal volume);
-            volume.Should().BeGreaterThan(0);
+            result.Volume.Should().BeGreaterThan(0);
         }
 
         [Fact]
@@ -87,11 +79,35 @@ public async Task Should_be_able_to_get_oc_book()
         public async Task Should_be_able_to_get_ohlcc_candles()
         {
             var subscriptionString = CryptoCompareSubscriptionFactory.GetOHLCCandlesSubscriptionStr("Binance", "btc", "usdt", "m");
-            var result = await GetResult<Ohlc>(subscriptionString).ConfigureAwait(false);
+            var result = await GetResult<Ohlc>(subscriptionString);
             result!.Open.Should().BeGreaterThan(0);
             result!.LastTimeStamp.Should().BeGreaterThan(0);
             result!.Market.Should().NotBeNull();
             result.Close.Should().BeGreaterThan(0);
         }
+
+        #region IDisposable
+
+        private bool _wasDisposed;
+
+        protected virtual bool Dispose(bool disposing)
+        {
+            if (_wasDisposed) return false;
+            if (disposing)
+            {
+                _serviceScope.Dispose();
+            }
+
+            _wasDisposed = true;
+            return true;
+        }
+
+        public void Dispose()
+        {
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
+
+        #endregion
     }
 }
diff --git a/...ptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj b/...ptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj
@@ -18,18 +18,18 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="GitHubActionsTestLogger" Version="2.2.1">
+        <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="NSubstitute" Version="5.0.0" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="NSubstitute" Version="5.1.0" />
+        <PackageReference Include="xunit" Version="2.6.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
-        <PackageReference Include="Trakx.Common.Testing.Documentation" Version="0.2.2" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="Trakx.Common.Testing.Documentation" Version="0.5.1" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/...rakx.CryptoCompare.ApiClient.Websocket/Extensions/AddCryptoCompareWebsocketsExtensions.cs b/...rakx.CryptoCompare.ApiClient.Websocket/Extensions/AddCryptoCompareWebsocketsExtensions.cs
@@ -1,5 +1,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Trakx.Common.Configuration;
 using Trakx.Websocket;
 using Trakx.Websocket.Interfaces;
 using Trakx.Websocket.Model;
@@ -8,7 +9,10 @@ namespace Trakx.CryptoCompare.ApiClient.Websocket.Extensions;
 
 public static class AddCryptoCompareWebsocketsExtensions
 {
-    public static void AddCryptoCompareWebsockets(this IServiceCollection services, CryptoCompareApiConfiguration apiConfiguration, WebsocketConfiguration webSocketConfiguration)
+    public static void AddCryptoCompareWebsockets(
+        this IServiceCollection services,
+        CryptoCompareApiConfiguration apiConfiguration,
+        WebsocketConfiguration webSocketConfiguration)
     {
         services.AddSingleton<ICryptoCompareWebsocketHandler, CryptoCompareWebsocketHandler>();
         services.AddSingleton<IClientWebsocketFactory, ClientWebsocketFactory>();
@@ -18,10 +22,8 @@ public static void AddCryptoCompareWebsockets(this IServiceCollection services,
 
     public static void AddCryptoCompareWebsockets(this IServiceCollection services, IConfiguration config)
     {
-        var apiConfiguration = config.GetSection(nameof(CryptoCompareApiConfiguration))
-            .Get<CryptoCompareApiConfiguration>();
-        var webSocketConfig = config.GetSection(nameof(WebsocketConfiguration)).Get<WebsocketConfiguration>();
-
+        var apiConfiguration = config.GetConfiguration<CryptoCompareApiConfiguration>();
+        var webSocketConfig = config.GetConfiguration<WebsocketConfiguration>();
         AddCryptoCompareWebsockets(services, apiConfiguration, webSocketConfig);
     }
 }
diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/HeartBeat.cs b/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/HeartBeat.cs
@@ -4,6 +4,6 @@ namespace Trakx.CryptoCompare.ApiClient.Websocket.Model;
 
 public class HeartBeat : InboundMessageBase
 {
-    [JsonPropertyName("MESSAGE")] public string Message { get; set; }
-    [JsonPropertyName("TIMEMS")] public ulong TimeMs { get; set; }
+    [JsonPropertyName("MESSAGE")] public string? Message { get; set; }
+    [JsonPropertyName("TIMEMS")] public ulong? TimeMs { get; set; }
 }
diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/InboundMessageBase.cs b/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/InboundMessageBase.cs
@@ -4,5 +4,5 @@ namespace Trakx.CryptoCompare.ApiClient.Websocket.Model;
 
 public class InboundMessageBase
 {
-    [JsonPropertyName("TYPE")] public string Type { get; set; }
+    [JsonPropertyName("TYPE")] public string? Type { get; set; }
 }
diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ohlc.cs b/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ohlc.cs
@@ -1,5 +1,5 @@
 using System.Text.Json.Serialization;
-using Trakx.Common.Serialization.Converters;
+using Trakx.Common.Serialization.Comparers;
 
 namespace Trakx.CryptoCompare.ApiClient.Websocket.Model;
 

diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ticker.cs b/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ticker.cs
@@ -1,14 +1,13 @@
 using System.Text.Json.Serialization;
-using Trakx.Common.Serialization.Converters;
+using Trakx.Common.Serialization.Comparers;
 
 namespace Trakx.CryptoCompare.ApiClient.Websocket.Model;
 
 public class Ticker : InboundMessageBase
 {
-#nullable disable
-    [JsonPropertyName("MARKET")] public string Market { get; set; }
-    [JsonPropertyName("FROMSYMBOL")] public string BaseSymbol { get; set; }
-    [JsonPropertyName("TOSYMBOL")] public string QuoteSymbol { get; set; }
+    [JsonPropertyName("MARKET")] public string? Market { get; set; }
+    [JsonPropertyName("FROMSYMBOL")] public string? BaseSymbol { get; set; }
+    [JsonPropertyName("TOSYMBOL")] public string? QuoteSymbol { get; set; }
 
     [JsonPropertyName("FLAGS"), JsonConverter(typeof(ULongOrStringConverter))]
     public ulong Flags { get; set; }
@@ -33,5 +32,4 @@ public class Ticker : InboundMessageBase
     [JsonPropertyName("OPENHOUR")] public decimal? OpenHour { get; set; }
     [JsonPropertyName("HIGHHOUR")] public decimal? HighHour { get; set; }
     [JsonPropertyName("LOWHOUR")] public decimal? LowHour { get; set; }
-#nullable restore
 }
diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/TopTierFullVolume.cs b/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/TopTierFullVolume.cs
@@ -4,8 +4,9 @@ namespace Trakx.CryptoCompare.ApiClient.Websocket.Model;
 
 public class TopTierFullVolume : InboundMessageBase
 {
-#nullable disable
-    [JsonPropertyName("SYMBOL")] public string Symbol { get; set; }
-    [JsonPropertyName("TOPTIERFULLVOLUME")] public string Volume { get; set; }
-#nullable restore
+    [JsonPropertyName("SYMBOL")]
+    public string Symbol { get; set; } = default!;
+
+    [JsonPropertyName("TOPTIERFULLVOLUME")]
+    public decimal Volume { get; set; }
 }
diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Trade.cs b/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Trade.cs
@@ -1,5 +1,5 @@
 using System.Text.Json.Serialization;
-using Trakx.Common.Serialization.Converters;
+using Trakx.Common.Serialization.Comparers;
 
 namespace Trakx.CryptoCompare.ApiClient.Websocket.Model;
 

diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj b/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj
@@ -1,19 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
-	</PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+  </PropertyGroup>
 
-	<Import Project="../Common.Projects.props" />
-	<Import Project="../Packable.Projects.props" />
+  <Import Project="../Common.Projects.props" />
+  <Import Project="../Packable.Projects.props" />
 
-	<ItemGroup>
-		<PackageReference Include="Trakx.Common" Version="0.2.2" />
-		<PackageReference Include="Trakx.Websocket" Version="1.0.0" />
-	</ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Trakx.Common" Version="0.5.1" />
+    <PackageReference Include="Trakx.Common.Configuration" Version="0.5.1" />
+    <PackageReference Include="Trakx.Websocket" Version="1.0.0" />
+  </ItemGroup>
 
-	<ItemGroup>
-	  <ProjectReference Include="..\Trakx.CryptoCompare.ApiClient\Trakx.CryptoCompare.ApiClient.csproj" />
-	</ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Trakx.CryptoCompare.ApiClient\Trakx.CryptoCompare.ApiClient.csproj" />
+  </ItemGroup>
 
 </Project>