From 625dccbbe4ed6be13433c4d93fd749f073c11488 Mon Sep 17 00:00:00 2001 From: Jkorf Date: Tue, 7 Jan 2025 13:22:16 +0100 Subject: [PATCH] Added ExchangeType enum, some small improvements --- CryptoExchange.Net/Clients/RestApiClient.cs | 6 +++--- CryptoExchange.Net/Objects/Enums.cs | 14 ++++++++++++++ CryptoExchange.Net/Objects/TimeSyncState.cs | 4 ++-- CryptoExchange.Net/Requests/RequestFactory.cs | 2 +- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/CryptoExchange.Net/Clients/RestApiClient.cs b/CryptoExchange.Net/Clients/RestApiClient.cs index dfcc49a..6b6b813 100644 --- a/CryptoExchange.Net/Clients/RestApiClient.cs +++ b/CryptoExchange.Net/Clients/RestApiClient.cs @@ -624,7 +624,7 @@ namespace CryptoExchange.Net.Clients paramString = $" with request body '{request.Content}'"; var headers = request.GetHeaders(); - if (headers.Any()) + if (headers.Count != 0) paramString += " with headers " + string.Join(", ", headers.Select(h => h.Key + $"=[{string.Join(",", h.Value)}]")); TotalRequestsMade++; @@ -908,8 +908,8 @@ namespace CryptoExchange.Net.Clients { // Write the parameters as json in the body string stringData; - if (parameters.Count == 1 && parameters.ContainsKey(Constants.BodyPlaceHolderKey)) - stringData = CreateSerializer().Serialize(parameters[Constants.BodyPlaceHolderKey]); + if (parameters.Count == 1 && parameters.TryGetValue(Constants.BodyPlaceHolderKey, out object? value)) + stringData = CreateSerializer().Serialize(value); else stringData = CreateSerializer().Serialize(parameters); request.SetContent(stringData, contentType); diff --git a/CryptoExchange.Net/Objects/Enums.cs b/CryptoExchange.Net/Objects/Enums.cs index a0f877c..27e8e35 100644 --- a/CryptoExchange.Net/Objects/Enums.cs +++ b/CryptoExchange.Net/Objects/Enums.cs @@ -235,4 +235,18 @@ Cache } + /// + /// Type of exchange + /// + public enum ExchangeType + { + /// + /// Centralized + /// + CEX, + /// + /// Decentralized + /// + DEX + } } diff --git a/CryptoExchange.Net/Objects/TimeSyncState.cs b/CryptoExchange.Net/Objects/TimeSyncState.cs index 8185302..021a9fb 100644 --- a/CryptoExchange.Net/Objects/TimeSyncState.cs +++ b/CryptoExchange.Net/Objects/TimeSyncState.cs @@ -82,12 +82,12 @@ namespace CryptoExchange.Net.Objects TimeSyncState.LastSyncTime = DateTime.UtcNow; if (offset.TotalMilliseconds > 0 && offset.TotalMilliseconds < 500) { - Logger.Log(LogLevel.Information, $"{TimeSyncState.ApiName} Time offset within limits, set offset to 0ms"); + Logger.Log(LogLevel.Information, "{TimeSyncState.ApiName} Time offset within limits, set offset to 0ms", TimeSyncState.ApiName); TimeSyncState.TimeOffset = TimeSpan.Zero; } else { - Logger.Log(LogLevel.Information, $"{TimeSyncState.ApiName} Time offset set to {Math.Round(offset.TotalMilliseconds)}ms"); + Logger.Log(LogLevel.Information, "{TimeSyncState.ApiName} Time offset set to {Offset}ms", TimeSyncState.ApiName, Math.Round(offset.TotalMilliseconds)); TimeSyncState.TimeOffset = offset; } } diff --git a/CryptoExchange.Net/Requests/RequestFactory.cs b/CryptoExchange.Net/Requests/RequestFactory.cs index 693e91d..91bb97c 100644 --- a/CryptoExchange.Net/Requests/RequestFactory.cs +++ b/CryptoExchange.Net/Requests/RequestFactory.cs @@ -37,7 +37,7 @@ namespace CryptoExchange.Net.Requests _httpClient = CreateClient(proxy, requestTimeout); } - private HttpClient CreateClient(ApiProxy? proxy, TimeSpan requestTimeout) + private static HttpClient CreateClient(ApiProxy? proxy, TimeSpan requestTimeout) { var handler = new HttpClientHandler(); try