From c1a0c73a80a881e609f69022c7f769194c340060 Mon Sep 17 00:00:00 2001 From: JKorf Date: Wed, 27 Mar 2024 22:06:41 +0100 Subject: [PATCH] String comparison improvement --- .../SpotApi/BitfinexSocketClientSpotApi.cs | 4 +- .../Sockets/Queries/BitfinexSubQuery.cs | 5 +- .../Subscriptions/BitfinexSubscription.cs | 4 +- .../Subscriptions/BitfinexUserSubscription.cs | 62 ++++++++++++------- 4 files changed, 48 insertions(+), 27 deletions(-) diff --git a/Bitfinex.Net/Clients/SpotApi/BitfinexSocketClientSpotApi.cs b/Bitfinex.Net/Clients/SpotApi/BitfinexSocketClientSpotApi.cs index 1061ceb..21b16c7 100644 --- a/Bitfinex.Net/Clients/SpotApi/BitfinexSocketClientSpotApi.cs +++ b/Bitfinex.Net/Clients/SpotApi/BitfinexSocketClientSpotApi.cs @@ -357,7 +357,7 @@ public async Task> CancelFundingOfferAsync(long return message.GetValue(_0Path).ToString(); var evnt = message.GetValue(_eventPath); - if (evnt == "info") + if (string.Equals(evnt, "info", StringComparison.Ordinal)) return "info"; var channel = message.GetValue(_channelPath); @@ -366,7 +366,7 @@ public async Task> CancelFundingOfferAsync(long var freq = message.GetValue(_freqPath); var len = message.GetValue(_lenPath); var key = message.GetValue(_keyPath); - var chanId = evnt == "unsubscribed" ? message.GetValue(_chanIdPath) : ""; + var chanId = string.Equals(evnt, "unsubscribed", StringComparison.Ordinal) ? message.GetValue(_chanIdPath) : ""; return chanId + evnt + channel + symbol + prec + freq + len + key; } diff --git a/Bitfinex.Net/Objects/Sockets/Queries/BitfinexSubQuery.cs b/Bitfinex.Net/Objects/Sockets/Queries/BitfinexSubQuery.cs index a80c1a3..605a6aa 100644 --- a/Bitfinex.Net/Objects/Sockets/Queries/BitfinexSubQuery.cs +++ b/Bitfinex.Net/Objects/Sockets/Queries/BitfinexSubQuery.cs @@ -1,6 +1,7 @@ using CryptoExchange.Net.Objects; using CryptoExchange.Net.Objects.Sockets; using CryptoExchange.Net.Sockets; +using System; using System.Collections.Generic; using System.Threading.Tasks; @@ -21,7 +22,7 @@ public BitfinexSubQuery(string evnt, string channel, string? symbol, string? pre Key = key }, false, 1) { - if (evnt == "subscribe" || evnt == "unsubscribe") + if (string.Equals(evnt, "subscribe", StringComparison.Ordinal) || string.Equals(evnt, "unsubscribe", StringComparison.Ordinal)) evnt += "d"; ListenerIdentifiers = new HashSet @@ -33,7 +34,7 @@ public BitfinexSubQuery(string evnt, string channel, string? symbol, string? pre public override CallResult HandleMessage(SocketConnection connection, DataEvent message) { - if (message.Data.Event == "error") + if (string.Equals(message.Data.Event, "error", StringComparison.Ordinal)) return new CallResult(new ServerError(message.Data.Message!)); return new CallResult(message.Data); diff --git a/Bitfinex.Net/Objects/Sockets/Subscriptions/BitfinexSubscription.cs b/Bitfinex.Net/Objects/Sockets/Subscriptions/BitfinexSubscription.cs index 2f5da1c..c89e5fd 100644 --- a/Bitfinex.Net/Objects/Sockets/Subscriptions/BitfinexSubscription.cs +++ b/Bitfinex.Net/Objects/Sockets/Subscriptions/BitfinexSubscription.cs @@ -64,10 +64,10 @@ public BitfinexSubscription(ILogger logger, { var identifier = message.GetValue(_1Path); - if (identifier == "cs") + if (string.Equals(identifier, "cs", StringComparison.Ordinal)) return typeof(BitfinexChecksum); - if (identifier == "hb") + if (string.Equals(identifier, "hb", StringComparison.Ordinal)) return typeof(BitfinexUpdate); if (identifier == null) diff --git a/Bitfinex.Net/Objects/Sockets/Subscriptions/BitfinexUserSubscription.cs b/Bitfinex.Net/Objects/Sockets/Subscriptions/BitfinexUserSubscription.cs index 882eeed..d25fae1 100644 --- a/Bitfinex.Net/Objects/Sockets/Subscriptions/BitfinexUserSubscription.cs +++ b/Bitfinex.Net/Objects/Sockets/Subscriptions/BitfinexUserSubscription.cs @@ -35,60 +35,80 @@ internal class BitfinexUserSubscription : Subscription(_messagePath); - if (identifier == "hb") + if (string.Equals(identifier, "hb", StringComparison.Ordinal)) return typeof(BitfinexSocketEvent); - if (identifier == "ps") + if (string.Equals(identifier, "ps", StringComparison.Ordinal)) return typeof(BitfinexSocketEvent>); - if (identifier == "pn" || identifier == "pu" || identifier == "pc") + if (string.Equals(identifier, "pn", StringComparison.Ordinal) + || string.Equals(identifier, "pu", StringComparison.Ordinal) + || string.Equals(identifier, "pc", StringComparison.Ordinal)) + { return typeof(BitfinexSocketEvent); + } - if (identifier == "bu") + if (string.Equals(identifier, "bu", StringComparison.Ordinal)) return typeof(BitfinexSocketEvent); - if (identifier == "miu") + if (string.Equals(identifier, "miu", StringComparison.Ordinal)) { var marginInfoType = message.GetValue(_marginInfoPath); - return marginInfoType == "base" ? typeof(BitfinexSocketEvent) : typeof(BitfinexSocketEvent); + return string.Equals(marginInfoType, "base", StringComparison.Ordinal) ? typeof(BitfinexSocketEvent) : typeof(BitfinexSocketEvent); } - if (identifier == "fiu") + if (string.Equals(identifier, "fiu", StringComparison.Ordinal)) return typeof(BitfinexSocketEvent); - if (identifier == "ws") + if (string.Equals(identifier, "ws", StringComparison.Ordinal)) return typeof(BitfinexSocketEvent>); - if (identifier == "wu") + if (string.Equals(identifier, "wu", StringComparison.Ordinal)) return typeof(BitfinexSocketEvent); - if (identifier == "os") + if (string.Equals(identifier, "os", StringComparison.Ordinal)) return typeof(BitfinexSocketEvent>); - if (identifier == "on" || identifier == "ou" || identifier == "oc") + if (string.Equals(identifier, "on", StringComparison.Ordinal) + || string.Equals(identifier, "ou", StringComparison.Ordinal) + || string.Equals(identifier, "oc", StringComparison.Ordinal)) + { return typeof(BitfinexSocketEvent); + } - if (identifier == "te") + if (string.Equals(identifier, "te", StringComparison.Ordinal)) return typeof(BitfinexSocketEvent); - if (identifier == "tu") + if (string.Equals(identifier, "tu", StringComparison.Ordinal)) return typeof(BitfinexSocketEvent); - if (identifier == "fte") + if (string.Equals(identifier, "fte", StringComparison.Ordinal)) return typeof(BitfinexSocketEvent); - if (identifier == "ftu") + if (string.Equals(identifier, "ftu", StringComparison.Ordinal)) return typeof(BitfinexSocketEvent); - if (identifier == "fos") + if (string.Equals(identifier, "fos", StringComparison.Ordinal)) return typeof(BitfinexSocketEvent>); - if (identifier == "fon" || identifier == "fou" || identifier == "foc") + if (string.Equals(identifier, "fon", StringComparison.Ordinal) + || string.Equals(identifier, "fou", StringComparison.Ordinal) + || string.Equals(identifier, "foc", StringComparison.Ordinal)) + { return typeof(BitfinexSocketEvent); + } - if (identifier == "fcs") + if (string.Equals(identifier, "fcs", StringComparison.Ordinal)) return typeof(BitfinexSocketEvent>); - if (identifier == "fcn" || identifier == "fcu" || identifier == "fcc") + if (string.Equals(identifier, "fcn", StringComparison.Ordinal) + || string.Equals(identifier, "fcu", StringComparison.Ordinal) + || string.Equals(identifier, "fcc", StringComparison.Ordinal)) + { return typeof(BitfinexSocketEvent); + } - if (identifier == "fls") + if (string.Equals(identifier, "fls", StringComparison.Ordinal)) return typeof(BitfinexSocketEvent>); - if (identifier == "fln" || identifier == "flu" || identifier == "flc") + if (string.Equals(identifier, "fln", StringComparison.Ordinal) + || string.Equals(identifier, "flu", StringComparison.Ordinal) + || string.Equals(identifier, "flc", StringComparison.Ordinal)) + { return typeof(BitfinexSocketEvent); + } return null; }