Refactored code that checks for default hosts when retrying fallbacks

ably · Apr 19, 2024 · e044c22 · e044c22
1 parent c2d5739
commit e044c22
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/src/IO.Ably.Shared/ClientOptions.cs b/src/IO.Ably.Shared/ClientOptions.cs
@@ -147,10 +147,6 @@ public string[] FallbackHosts
 
         internal bool IsProductionEnvironment => Environment.IsEmpty() || Environment.Equals("production", StringComparison.OrdinalIgnoreCase);
 
-        internal bool IsDefaultRestHost => FullRestHost() == Defaults.RestHost;
-
-        internal bool IsDefaultRealtimeHost => FullRealtimeHost() == Defaults.RealtimeHost;
-
         internal bool IsDefaultPort => Tls ? TlsPort == Defaults.TlsPort : Port == Defaults.Port;
 
         /// <summary>

diff --git a/src/IO.Ably.Shared/Realtime/AttemptsHelpers.cs b/src/IO.Ably.Shared/Realtime/AttemptsHelpers.cs
@@ -9,14 +9,7 @@ internal static class AttemptsHelpers
     {
         public static async Task<bool> CanFallback(this AblyRest restClient, ErrorInfo error)
         {
-            return IsDefaultHost() &&
-                   error != null && error.IsRetryableStatusCode() &&
-                   await restClient.CanConnectToAbly();
-
-            bool IsDefaultHost()
-            {
-                return restClient.Options.IsDefaultRealtimeHost;
-            }
+            return error != null && error.IsRetryableStatusCode() && await restClient.CanConnectToAbly();
         }
 
         public static bool ShouldSuspend(this RealtimeState state, Func<DateTimeOffset> now = null)

diff --git a/src/IO.Ably.Tests.Shared/Rest/RestSpecs.cs b/src/IO.Ably.Tests.Shared/Rest/RestSpecs.cs
@@ -607,7 +607,7 @@ public async Task ShouldUseCustomFallbackHostIfProvided()
             [Fact]
             [Trait("spec", "RSC15a")]
             [Trait("spec", "TO3k6")]
-            public async Task ShouldUseCustomFallbackHostIfProvidedAndDefaultHostIsDifferent()
+            public async Task ShouldUseProvidedCustomFallbackHostWhenDefaultHostIsDifferent()
             {
                 _response.StatusCode = HttpStatusCode.BadGateway;
                 var attemptedList = new List<string>();