Http,Network,Services.Utitlity: rename FSharpUtil

Renamed FSharpUtil module to AsyncUtil.
nblockchain · May 29, 2023 · 67a8ec0 · 67a8ec0
1 parent 92e5466
commit 67a8ec0
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 21 deletions.
diff --git a/NOnion/Directory/KeyCertificatesDocument.fs b/NOnion/Directory/KeyCertificatesDocument.fs
@@ -6,7 +6,7 @@ open System.Text
 open Org.BouncyCastle.Asn1
 
 open NOnion.Crypto.DirectoryCipher
-open NOnion.Utility.FSharpUtil
+open NOnion.Utility.AsyncUtil
 open NOnion.Utility.PemUtility
 
 type KeyCertificateEntry =

diff --git a/NOnion/Directory/TorDirectory.fs b/NOnion/Directory/TorDirectory.fs
@@ -13,7 +13,7 @@ open NOnion.Crypto
 open NOnion.Network
 open NOnion.Http
 open NOnion.Utility
-open NOnion.Utility.FSharpUtil
+open NOnion.Utility.AsyncUtil
 
 type RouterType =
     | Normal

diff --git a/NOnion/Http/TorHttpClient.fs b/NOnion/Http/TorHttpClient.fs
@@ -42,7 +42,7 @@ type TorHttpClient(stream: Stream, host: string) =
 
             do!
                 ReceiveAll memStream
-                |> FSharpUtil.WithTimeout Constants.HttpGetResponseTimeout
+                |> AsyncUtil.WithTimeout Constants.HttpGetResponseTimeout
 
             let httpResponse = memStream.ToArray()
 
@@ -135,7 +135,7 @@ type TorHttpClient(stream: Stream, host: string) =
 
             do!
                 ReceiveAll memStream
-                |> FSharpUtil.WithTimeout Constants.HttpPostResponseTimeout
+                |> AsyncUtil.WithTimeout Constants.HttpPostResponseTimeout
 
             let httpResponse = memStream.ToArray()
 

diff --git a/NOnion/NOnion.fsproj b/NOnion/NOnion.fsproj
@@ -19,9 +19,9 @@
     <Compile Include="RelayIntroduceStatus.fs" />
     <Compile Include="Exceptions.fs" />
     <Compile Include="HandshakeType.fs" />
+    <Compile Include="Utility\AsyncUtil.fs" />
     <Compile Include="Utility\EmbeddedResourceUtility.fs" />
     <Compile Include="Utility\PemUtility.fs" />
-    <Compile Include="Utility\FSharpUtil.fs" />
     <Compile Include="Utility\ResultUtil.fs" />
     <Compile Include="Utility\MailboxUtil.fs" />
     <Compile Include="Utility\StreamUtil.fs" />

diff --git a/NOnion/Network/TorCircuit.fs b/NOnion/Network/TorCircuit.fs
@@ -1118,7 +1118,7 @@ and TorCircuit
                 completionTaskRes
                 |> UnwrapResult
                 |> Async.AwaitTask
-                |> FSharpUtil.WithTimeout Constants.CircuitOperationTimeout
+                |> AsyncUtil.WithTimeout Constants.CircuitOperationTimeout
         }
 
     member __.Extend(nodeDetail: CircuitNodeDetail) =
@@ -1135,7 +1135,7 @@ and TorCircuit
                 completionTaskRes
                 |> UnwrapResult
                 |> Async.AwaitTask
-                |> FSharpUtil.WithTimeout Constants.CircuitOperationTimeout
+                |> AsyncUtil.WithTimeout Constants.CircuitOperationTimeout
         }
 
     member __.RegisterAsIntroductionPoint
@@ -1161,7 +1161,7 @@ and TorCircuit
                 completionTaskRes
                 |> UnwrapResult
                 |> Async.AwaitTask
-                |> FSharpUtil.WithTimeout Constants.CircuitOperationTimeout
+                |> AsyncUtil.WithTimeout Constants.CircuitOperationTimeout
         }
 
     member __.RegisterAsRendezvousPoint(cookie: array<byte>) =
@@ -1182,7 +1182,7 @@ and TorCircuit
                 completionTaskRes
                 |> UnwrapResult
                 |> Async.AwaitTask
-                |> FSharpUtil.WithTimeout Constants.CircuitOperationTimeout
+                |> AsyncUtil.WithTimeout Constants.CircuitOperationTimeout
         }
 
     member self.ExtendAsync nodeDetail =
@@ -1208,7 +1208,7 @@ and TorCircuit
                 completionTaskRes
                 |> UnwrapResult
                 |> Async.AwaitTask
-                |> FSharpUtil.WithTimeout Constants.CircuitOperationTimeout
+                |> AsyncUtil.WithTimeout Constants.CircuitOperationTimeout
         }
 
     member __.WaitingForRendezvousJoin
@@ -1236,7 +1236,7 @@ and TorCircuit
                 completionTaskRes
                 |> UnwrapResult
                 |> Async.AwaitTask
-                |> FSharpUtil.WithTimeout Constants.CircuitRendezvousTimeout
+                |> AsyncUtil.WithTimeout Constants.CircuitRendezvousTimeout
 
         }
 

diff --git a/NOnion/Network/TorGuard.fs b/NOnion/Network/TorGuard.fs
@@ -131,7 +131,7 @@ type TorGuard
                     do!
                         client.ConnectAsync(ipEndpoint.Address, ipEndpoint.Port)
                         |> Async.AwaitTask
-                        |> FSharpUtil.WithTimeout
+                        |> AsyncUtil.WithTimeout
                             Constants.GuardConnectionTimeout
                 }
 
@@ -159,7 +159,7 @@ type TorGuard
                     false
                 )
                 |> Async.AwaitTask
-                |> FSharpUtil.WithTimeout Constants.CircuitOperationTimeout
+                |> AsyncUtil.WithTimeout Constants.CircuitOperationTimeout
 
             do!
                 ExceptionUtil.RunGuardJobWithExceptionHandling<unit>(
@@ -534,7 +534,7 @@ type TorGuard
             TorLogger.Log "TorGuard: finished handshake process"
         //TODO: do security checks on handshake data
         }
-        |> FSharpUtil.WithTimeout Constants.CircuitOperationTimeout
+        |> AsyncUtil.WithTimeout Constants.CircuitOperationTimeout
 
     member internal __.RegisterCircuit(circuit: ITorCircuit) : uint16 =
         let rec createCircuitId(retry: int) =

diff --git a/NOnion/Network/TorStream.fs b/NOnion/Network/TorStream.fs
@@ -479,7 +479,7 @@ type TorStream(circuit: TorCircuit) =
                 completionTaskRes
                 |> UnwrapResult
                 |> Async.AwaitTask
-                |> FSharpUtil.WithTimeout Constants.StreamCreationTimeout
+                |> AsyncUtil.WithTimeout Constants.StreamCreationTimeout
         }
 
     member self.ConnectToDirectory() =
@@ -499,7 +499,7 @@ type TorStream(circuit: TorCircuit) =
                 completionTaskResult
                 |> UnwrapResult
                 |> Async.AwaitTask
-                |> FSharpUtil.WithTimeout Constants.StreamCreationTimeout
+                |> AsyncUtil.WithTimeout Constants.StreamCreationTimeout
         }
 
     member self.ConnectToDirectoryAsync() =
@@ -523,7 +523,7 @@ type TorStream(circuit: TorCircuit) =
                 completionTaskRes
                 |> UnwrapResult
                 |> Async.AwaitTask
-                |> FSharpUtil.WithTimeout Constants.StreamCreationTimeout
+                |> AsyncUtil.WithTimeout Constants.StreamCreationTimeout
         }
 
     member self.ConnectToOutsideAsync(address, port) =

diff --git a/NOnion/Services/TorServiceHost.fs b/NOnion/Services/TorServiceHost.fs
@@ -250,7 +250,7 @@ type TorServiceHost
                     introEncPubKey
 
             do!
-                FSharpUtil.Retry<NOnionException>
+                AsyncUtil.Retry<NOnionException>
                     connectToRendezvousJob
                     maxRendezvousConnectRetryCount
 

diff --git a/NOnion/Utility/FSharpUtil.fs → NOnion/Utility/AsyncUtil.fs b/NOnion/Utility/FSharpUtil.fs → NOnion/Utility/AsyncUtil.fs
@@ -1,14 +1,12 @@
 namespace NOnion.Utility
 
 open System
-open System.Runtime.ExceptionServices
 
-open FSharpx.Collections
 open Fsdk
 
 open NOnion
 
-module FSharpUtil =
+module AsyncUtil =
     let WithTimeout (timeSpan: TimeSpan) (job: Async<'R>) : Async<'R> =
         async {
             let! result = FSharpUtil.WithTimeout timeSpan job