Refactor delays

Author: sierpinskid

Assets/Plugins/StreamChat/Tests/StatefulClient/BaseStateIntegrationTests.cs

@@ -9,7 +9,6 @@
 using NUnit.Framework;
 using StreamChat.Core;
 using StreamChat.Core.Exceptions;
-using StreamChat.Core.InternalDTO.Requests;
 using StreamChat.Core.Requests;
 using StreamChat.Core.StatefulModels;
 using StreamChat.Libs.Auth;
@@ -59,33 +58,9 @@ protected async Task<IStreamChannel> CreateUniqueTempChannelAsync(string name =
             var channelId = "random-channel-11111-" + Guid.NewGuid();
             var client = overrideClient ?? Client;
 
-            const int maxAttempts = 20;
-            for (var i = 0; i < maxAttempts; i++)
-            {
-                try
-                {
-                    var channelState = await client.InternalGetOrCreateChannelWithIdAsync(ChannelType.Messaging, channelId, name, watch: watch);
-                    _tempChannels.Add(channelState);
-                    return channelState;
-                }
-                catch (StreamApiException e)
-                {
-                    if (i == maxAttempts - 1)
-                    {
-                        throw;
-                    }
-                    
-                    if (e.IsRateLimitExceededError())
-                    {
-                        await Task.Delay(i * 5 * 1000);
-                        continue;
-                    }
-
-                    throw;
-                }
-            }
-
-            throw new InvalidOperationException($"{nameof(CreateUniqueTempChannelAsync)} failed to due to max attempts reached.");
+            var channelState = await client.InternalGetOrCreateChannelWithIdAsync(ChannelType.Messaging, channelId, name, watch: watch);
+            _tempChannels.Add(channelState);
+            return channelState;
         }
 
         /// <summary>
@@ -143,7 +118,7 @@ protected static async Task WaitWhileTrueAsync(Func<bool> condition, int maxSeco
                     throw new TimeoutException("Timeout while waiting for condition");
                 }
 
-                var delay = (int)Math.Max(1, Math.Min(400, Math.Pow(2, i)));
+                var delay = (int)Math.Min(100 * 1000, Math.Pow(2, i + 9));
                 await Task.Delay(delay);
             }
 
@@ -167,7 +142,7 @@ protected static async Task WaitWhileFalseAsync(Func<bool> condition, int maxSec
                     throw new TimeoutException("Timeout while waiting for condition");
                 }
 
-                var delay = (int)Math.Max(1, Math.Min(400, Math.Pow(2, i)));
+                var delay = (int)Math.Min(100 * 1000, Math.Pow(2, i + 9));
                 await Task.Delay(delay);
             }
 
@@ -183,29 +158,33 @@ protected static async Task WaitWithTimeoutAsync(Task task, string exceptionMsg,
         }
 
         /// <summary>
-        /// Timeout will be doubled on each subsequent attempt. So max timeout = <see cref="initTimeoutMs"/> * 2^<see cref="maxAttempts"/>
+        /// Timeout will be doubled on each subsequent attempt. So max timeout = <see cref="initTimeoutMs"/> * 2^<see cref="maxSeconds"/>
         /// </summary>
-        protected static async Task<T> TryAsync<T>(Func<Task<T>> task, Predicate<T> successCondition, int maxAttempts = 20,
-            int initTimeoutMs = 150)
+        protected static async Task<T> TryAsync<T>(Func<Task<T>> task, Predicate<T> successCondition,
+            int maxSeconds = 1000)
         {
-            var response = default(T);
+            var sw = new Stopwatch();
+            sw.Start();
 
-            var attemptsLeft = maxAttempts;
-            while (attemptsLeft > 0)
+            for (int i = 0; i < int.MaxValue; i++)
             {
-                response = await task();
+                var response = await task();
 
                 if (successCondition(response))
                 {
                     return response;
                 }
+                
+                if (sw.Elapsed.Seconds > maxSeconds)
+                {
+                    throw new TimeoutException("Timeout while waiting for condition");
+                }
 
-                var delay = initTimeoutMs * Math.Pow(2, (maxAttempts - attemptsLeft));
-                await Task.Delay((int)delay);
-                attemptsLeft--;
+                var delay = (int)Math.Min(100 * 1000, Math.Pow(2, i + 9));
+                await Task.Delay(delay);
             }
 
-            return response;
+            throw new TimeoutException("Timeout while waiting for condition");
         }
 
         private readonly List<IStreamChannel> _tempChannels = new List<IStreamChannel>();
@@ -253,25 +232,7 @@ private async Task DeleteTempChannelsAsync()
                 return;
             }
 
-            for (int i = 0; i < 5; i++)
-            {
-                try
-                {
-                    await Client.DeleteMultipleChannelsAsync(_tempChannels, isHardDelete: true);
-                }
-                catch (StreamApiException streamApiException)
-                {
-                    if (streamApiException.Code == StreamApiException.RateLimitErrorHttpStatusCode)
-                    {
-                        await Task.Delay(1000);
-                    }
-
-                    Debug.Log($"Attempt {i} failed. Try {nameof(DeleteTempChannelsAsync)} again due to exception:  " + streamApiException);
-                    continue;
-                }
-
-                break;
-            }
+            await Client.DeleteMultipleChannelsAsync(_tempChannels, isHardDelete: true);
 
             _tempChannels.Clear();
         }