From 0cff678c2d28a57394d9945e2a25a62ca01adb59 Mon Sep 17 00:00:00 2001 From: JKorf Date: Mon, 26 Feb 2024 14:28:34 +0100 Subject: [PATCH] Converter fixes --- CryptoExchange.Net/Converters/DateTimeConverter.cs | 8 +++++--- .../Converters/DecimalStringWriterConverter.cs | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CryptoExchange.Net/Converters/DateTimeConverter.cs b/CryptoExchange.Net/Converters/DateTimeConverter.cs index 4aa1f60..e3f2a1d 100644 --- a/CryptoExchange.Net/Converters/DateTimeConverter.cs +++ b/CryptoExchange.Net/Converters/DateTimeConverter.cs @@ -26,7 +26,12 @@ namespace CryptoExchange.Net.Converters public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer) { if (reader.Value == null) + { + if (objectType == typeof(DateTime)) + return default(DateTime); + return null; + } if(reader.TokenType is JsonToken.Integer) { @@ -56,9 +61,6 @@ namespace CryptoExchange.Net.Converters else if(reader.TokenType is JsonToken.String) { var stringValue = (string)reader.Value; - if (string.IsNullOrWhiteSpace(stringValue)) - return null; - if (string.IsNullOrWhiteSpace(stringValue) || stringValue == "-1" || (double.TryParse(stringValue, out var doubleVal) && doubleVal == 0)) diff --git a/CryptoExchange.Net/Converters/DecimalStringWriterConverter.cs b/CryptoExchange.Net/Converters/DecimalStringWriterConverter.cs index ca646fb..4053372 100644 --- a/CryptoExchange.Net/Converters/DecimalStringWriterConverter.cs +++ b/CryptoExchange.Net/Converters/DecimalStringWriterConverter.cs @@ -2,7 +2,7 @@ using System; using System.Globalization; -namespace Kraken.Net.Converters +namespace CryptoExchange.Net.Converters { /// /// Converter for serializing decimal values as string @@ -14,7 +14,7 @@ namespace Kraken.Net.Converters /// public override bool CanConvert(Type objectType) => objectType == typeof(decimal) || objectType == typeof(decimal?); - + /// public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer) {