Utility: made Retry func take 1 type parameter

Changed Retry function to take 1 type parameter instead of 2 as handling 2 types of exceptions is not needed anymore because SocketException is wrapped in NOnionException.
nblockchain · Jan 9, 2023 · 05bd5a1 · 05bd5a1
1 parent 4a052d0
commit 05bd5a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/NOnion/Services/TorServiceHost.fs b/NOnion/Services/TorServiceHost.fs
@@ -246,7 +246,7 @@ type TorServiceHost
                     introEncPubKey
 
             do!
-                FSharpUtil.Retry<SocketException, NOnionException>
+                FSharpUtil.Retry<NOnionException>
                     connectToRendezvousJob
                     maxRendezvousConnectRetryCount
 

diff --git a/NOnion/Utility/FSharpUtil.fs b/NOnion/Utility/FSharpUtil.fs
@@ -65,7 +65,7 @@ module FSharpUtil =
                 return failwith "unreachable"
         }
 
-    let Retry<'E1, 'E2 when 'E1 :> Exception and 'E2 :> Exception>
+    let Retry<'TEx when 'TEx :> Exception>
         (jobToRetry: Async<unit>)
         (maxRetryCount: int)
         =
@@ -74,8 +74,7 @@ module FSharpUtil =
                 try
                     do! jobToRetry
                 with
-                | :? 'E1
-                | :? 'E2 as ex ->
+                | :? 'TEx as ex ->
                     if tryNumber < maxRetryCount then
                         return! retryLoop(tryNumber + 1)
                     else