Fix properties, and deserialization issue, added test

Author: glitch100

BinanceExchange.API/Models/Response/WithdrawListItem.cs

@@ -14,7 +14,7 @@ public class WithdrawListItem : IResponse
         public string Id { get; set; }
 
         [DataMember(Order = 2)]
-        public long Amount { get; set; }
+        public decimal Amount { get; set; }
 
         [DataMember(Order = 3)]
         public string Address { get; set; }

BinanceExchange.API/Models/Websocket/BinanceTradeOrderData.cs

@@ -14,136 +14,115 @@ namespace BinanceExchange.API.Models.WebSocket
     [DataContract]
     public class BinanceTradeOrderData: ISymbolWebSocketResponse
     {
-        [DataMember(Order = 1)]
         [JsonProperty(PropertyName = "e")]
         public string EventType { get; set; }
 
-        [DataMember(Order = 2)]
         [JsonProperty(PropertyName = "E")]
         [JsonConverter(typeof(EpochTimeConverter))]
         public DateTime EventTime { get; set; }
 
-        [DataMember(Order = 3)]
         [JsonProperty(PropertyName = "s")]
         public string Symbol { get; set; }
 
-        [DataMember(Order = 4)]
         [JsonProperty(PropertyName = "c")]
         public string NewClientOrderId { get; set; }
 
-        [DataMember(Order = 5)]
         [JsonProperty(PropertyName = "S")]
         [JsonConverter(typeof(StringEnumConverter))]
         public OrderSide Side { get; set; }
 
-        [DataMember(Order = 6)]
         [JsonProperty(PropertyName = "o")]
         [JsonConverter(typeof(StringEnumConverter))]
         public OrderType Type { get; set; }
 
-        [DataMember(Order = 7)]
+        [JsonProperty(PropertyName = "O")]
+        public string DEPRECATED_FIELD_TYPE { get; set; }
+
         [JsonProperty(PropertyName = "f")]
         [JsonConverter(typeof(StringEnumConverter))]
         public TimeInForce TimeInForce { get; set; }
 
-        [DataMember(Order = 7)]
         [JsonProperty(PropertyName = "q")]
         public decimal Quantity { get; set; }
 
-        [DataMember(Order = 8)]
         [JsonProperty(PropertyName = "p")]
         public decimal Price { get; set; }
 
         #region Undefined API Result fields
         //TODO: Update when Binance API updated
-        [DataMember(Order = 9)]
         [JsonProperty(PropertyName = "P")]
         public double P { get; set; }
 
-        [DataMember(Order = 10)]
         [JsonProperty(PropertyName = "F")]
         public double F { get; set; }
 
-        [DataMember(Order = 11)]
         [JsonProperty(PropertyName = "g")]
         public string G { get; set; }
 
-        [DataMember(Order = 12)]
         [JsonProperty(PropertyName = "C")]
         public string C { get; set; }
         #endregion
 
-        [DataMember(Order = 13)]
         [JsonProperty(PropertyName = "x")]
         [JsonConverter(typeof(StringEnumConverter))]
         public ExecutionType ExecutionType { get; set; }
 
-        [DataMember(Order = 14)]
         [JsonProperty(PropertyName = "X")]
         [JsonConverter(typeof(StringEnumConverter))]
         public OrderStatus OrderStatus { get; set; }
 
-        [DataMember(Order = 15)]
         [JsonProperty(PropertyName = "r")]
         [JsonConverter(typeof(StringEnumConverter))]
         public OrderRejectReason OrderRejectReason { get; set; }
 
         #region Undefined API Result fields
         //TODO: Update when Binance API updated
-        [DataMember(Order = 16)]
         [JsonProperty(PropertyName = "i")]
         public long OrderId { get; set; }
 
-        [DataMember(Order = 17)]
+        [JsonProperty(PropertyName = "I")]
+        public string DEPRECATED_FIELD_ORDERID { get; set; }
+
         [JsonProperty(PropertyName = "l")]
         public decimal QuantityOfLastFilledTrade { get; set; }
 
-        [DataMember(Order = 18)]
         [JsonProperty(PropertyName = "z")]
         public decimal AccumulatedQuantityOfFilledTradesThisOrder { get; set; }
 
-        [DataMember(Order = 19)]
         [JsonProperty(PropertyName = "L")]
         public decimal PriceOfLastFilledTrade { get; set; }
 
-        [DataMember(Order = 20)]
         [JsonProperty(PropertyName = "n")]
         public decimal Commission { get; set; }
 
         /// <summary>
         /// Asset on which commission taken
         /// </summary>
-        [DataMember(Order = 21)]
         [JsonProperty(PropertyName = "N")]
         public string AssetCommissionTakenFrom { get; set; }
         #endregion
 
         /// <summary>
         /// Represents Order or Trade time
         /// </summary>
-        [DataMember(Order = 22)]
         [JsonProperty(PropertyName = "T")]
         [JsonConverter(typeof(EpochTimeConverter))]
         public DateTime TimeStamp { get; set; }
 
-        [DataMember(Order = 23)]
         [JsonProperty(PropertyName = "t")]
         public long TradeId { get; set; }
 
         #region Undefined API Result fields
 
-        [DataMember(Order = 26)]
         [JsonProperty(PropertyName = "w")]
         public bool w { get; set; }
         #endregion
 
-        [DataMember(Order = 27)]
         [JsonProperty(PropertyName = "m")]
         public bool IsBuyerMaker { get; set; }
 
         #region Undefined API Result fields
         //TODO: Update when Binance API updated
-        [DataMember(Order = 28)]
         [JsonProperty(PropertyName = "M")]
         public bool M { get; set; }
         #endregion

BinanceExchange.Tests/Client/BinanceClient/ModelTests/BinanceTradeOrderDataTests.cs

@@ -0,0 +1,22 @@
+using BinanceExchange.API.Enums;
+using BinanceExchange.API.Models.WebSocket;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace BinanceExchange.Tests.Client.BinanceClient.ModelTests
+{
+    public class BinanceTradeOrderDataTests
+    {
+        [Fact]
+        public void CanDeserializeCaseSensitiveProperties()
+        {
+            var jsonPayload =
+                "{ \"e\": \"executionReport\", \"E\": 1552602237245, \"s\": \"BNBBTC\", \"c\": \"pc_12cbcdd2ebbe4893a5d5de4ef27b3954\", \"S\": \"SELL\", \"o\": \"LIMIT\", \"f\": \"GTC\", \"q\": \"0.62000000\", \"p\": \"0.00487400\", \"P\": \"0.00000000\", \"F\": \"0.00000000\", \"g\": -1, \"C\": \"pc_31471433322c4166a05c58152650c96a\", \"x\": \"CANCELED\", \"X\": \"CANCELED\", \"r\": \"NONE\", \"i\": 124465346, \"l\": \"0.00000000\", \"z\": \"0.00000000\", \"L\": \"0.00000000\", \"n\": \"0\", \"N\": null, \"T\": 1552602237240, \"t\": -1, \"I\": 286808464, \"w\": false, \"m\": false, \"M\": false, \"O\": 1552601178372, \"Z\": \"0.00000000\", \"Y\": \"0.00000000\" }";
+
+            var result = JsonConvert.DeserializeObject<BinanceTradeOrderData>(jsonPayload);
+
+            Assert.Equal(124465346,result.OrderId);
+            Assert.Equal(OrderType.Limit,result.Type);
+        }
+    }
+}