Skip to content

Commit 67a8ec0

Browse files
webwarrior-wswebwarrior-ws
committed
Http,Network,Services.Utitlity: rename FSharpUtil
Renamed FSharpUtil module to AsyncUtil.
1 parent 92e5466 commit 67a8ec0

File tree

9 files changed

+19
-21
lines changed

9 files changed

+19
-21
lines changed

‎NOnion/Directory/KeyCertificatesDocument.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ open System.Text
66
open Org.BouncyCastle.Asn1
77

88
open NOnion.Crypto.DirectoryCipher
9-
open NOnion.Utility.FSharpUtil
9+
open NOnion.Utility.AsyncUtil
1010
open NOnion.Utility.PemUtility
1111

1212
type KeyCertificateEntry =

‎NOnion/Directory/TorDirectory.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ open NOnion.Crypto
1313
open NOnion.Network
1414
open NOnion.Http
1515
open NOnion.Utility
16-
open NOnion.Utility.FSharpUtil
16+
open NOnion.Utility.AsyncUtil
1717

1818
type RouterType =
1919
| Normal

‎NOnion/Http/TorHttpClient.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ type TorHttpClient(stream: Stream, host: string) =
4242

4343
do!
4444
ReceiveAll memStream
45-
|> FSharpUtil.WithTimeout Constants.HttpGetResponseTimeout
45+
|> AsyncUtil.WithTimeout Constants.HttpGetResponseTimeout
4646

4747
let httpResponse = memStream.ToArray()
4848

@@ -135,7 +135,7 @@ type TorHttpClient(stream: Stream, host: string) =
135135

136136
do!
137137
ReceiveAll memStream
138-
|> FSharpUtil.WithTimeout Constants.HttpPostResponseTimeout
138+
|> AsyncUtil.WithTimeout Constants.HttpPostResponseTimeout
139139

140140
let httpResponse = memStream.ToArray()
141141

‎NOnion/NOnion.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<Compile Include="RelayIntroduceStatus.fs" />
2020
<Compile Include="Exceptions.fs" />
2121
<Compile Include="HandshakeType.fs" />
22+
<Compile Include="Utility\AsyncUtil.fs" />
2223
<Compile Include="Utility\EmbeddedResourceUtility.fs" />
2324
<Compile Include="Utility\PemUtility.fs" />
24-
<Compile Include="Utility\FSharpUtil.fs" />
2525
<Compile Include="Utility\ResultUtil.fs" />
2626
<Compile Include="Utility\MailboxUtil.fs" />
2727
<Compile Include="Utility\StreamUtil.fs" />

‎NOnion/Network/TorCircuit.fs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,7 @@ and TorCircuit
11181118
completionTaskRes
11191119
|> UnwrapResult
11201120
|> Async.AwaitTask
1121-
|> FSharpUtil.WithTimeout Constants.CircuitOperationTimeout
1121+
|> AsyncUtil.WithTimeout Constants.CircuitOperationTimeout
11221122
}
11231123

11241124
member __.Extend(nodeDetail: CircuitNodeDetail) =
@@ -1135,7 +1135,7 @@ and TorCircuit
11351135
completionTaskRes
11361136
|> UnwrapResult
11371137
|> Async.AwaitTask
1138-
|> FSharpUtil.WithTimeout Constants.CircuitOperationTimeout
1138+
|> AsyncUtil.WithTimeout Constants.CircuitOperationTimeout
11391139
}
11401140

11411141
member __.RegisterAsIntroductionPoint
@@ -1161,7 +1161,7 @@ and TorCircuit
11611161
completionTaskRes
11621162
|> UnwrapResult
11631163
|> Async.AwaitTask
1164-
|> FSharpUtil.WithTimeout Constants.CircuitOperationTimeout
1164+
|> AsyncUtil.WithTimeout Constants.CircuitOperationTimeout
11651165
}
11661166

11671167
member __.RegisterAsRendezvousPoint(cookie: array<byte>) =
@@ -1182,7 +1182,7 @@ and TorCircuit
11821182
completionTaskRes
11831183
|> UnwrapResult
11841184
|> Async.AwaitTask
1185-
|> FSharpUtil.WithTimeout Constants.CircuitOperationTimeout
1185+
|> AsyncUtil.WithTimeout Constants.CircuitOperationTimeout
11861186
}
11871187

11881188
member self.ExtendAsync nodeDetail =
@@ -1208,7 +1208,7 @@ and TorCircuit
12081208
completionTaskRes
12091209
|> UnwrapResult
12101210
|> Async.AwaitTask
1211-
|> FSharpUtil.WithTimeout Constants.CircuitOperationTimeout
1211+
|> AsyncUtil.WithTimeout Constants.CircuitOperationTimeout
12121212
}
12131213

12141214
member __.WaitingForRendezvousJoin
@@ -1236,7 +1236,7 @@ and TorCircuit
12361236
completionTaskRes
12371237
|> UnwrapResult
12381238
|> Async.AwaitTask
1239-
|> FSharpUtil.WithTimeout Constants.CircuitRendezvousTimeout
1239+
|> AsyncUtil.WithTimeout Constants.CircuitRendezvousTimeout
12401240

12411241
}
12421242

‎NOnion/Network/TorGuard.fs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ type TorGuard
131131
do!
132132
client.ConnectAsync(ipEndpoint.Address, ipEndpoint.Port)
133133
|> Async.AwaitTask
134-
|> FSharpUtil.WithTimeout
134+
|> AsyncUtil.WithTimeout
135135
Constants.GuardConnectionTimeout
136136
}
137137

@@ -159,7 +159,7 @@ type TorGuard
159159
false
160160
)
161161
|> Async.AwaitTask
162-
|> FSharpUtil.WithTimeout Constants.CircuitOperationTimeout
162+
|> AsyncUtil.WithTimeout Constants.CircuitOperationTimeout
163163

164164
do!
165165
ExceptionUtil.RunGuardJobWithExceptionHandling<unit>(
@@ -534,7 +534,7 @@ type TorGuard
534534
TorLogger.Log "TorGuard: finished handshake process"
535535
//TODO: do security checks on handshake data
536536
}
537-
|> FSharpUtil.WithTimeout Constants.CircuitOperationTimeout
537+
|> AsyncUtil.WithTimeout Constants.CircuitOperationTimeout
538538

539539
member internal __.RegisterCircuit(circuit: ITorCircuit) : uint16 =
540540
let rec createCircuitId(retry: int) =

‎NOnion/Network/TorStream.fs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ type TorStream(circuit: TorCircuit) =
479479
completionTaskRes
480480
|> UnwrapResult
481481
|> Async.AwaitTask
482-
|> FSharpUtil.WithTimeout Constants.StreamCreationTimeout
482+
|> AsyncUtil.WithTimeout Constants.StreamCreationTimeout
483483
}
484484

485485
member self.ConnectToDirectory() =
@@ -499,7 +499,7 @@ type TorStream(circuit: TorCircuit) =
499499
completionTaskResult
500500
|> UnwrapResult
501501
|> Async.AwaitTask
502-
|> FSharpUtil.WithTimeout Constants.StreamCreationTimeout
502+
|> AsyncUtil.WithTimeout Constants.StreamCreationTimeout
503503
}
504504

505505
member self.ConnectToDirectoryAsync() =
@@ -523,7 +523,7 @@ type TorStream(circuit: TorCircuit) =
523523
completionTaskRes
524524
|> UnwrapResult
525525
|> Async.AwaitTask
526-
|> FSharpUtil.WithTimeout Constants.StreamCreationTimeout
526+
|> AsyncUtil.WithTimeout Constants.StreamCreationTimeout
527527
}
528528

529529
member self.ConnectToOutsideAsync(address, port) =

‎NOnion/Services/TorServiceHost.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ type TorServiceHost
250250
introEncPubKey
251251

252252
do!
253-
FSharpUtil.Retry<NOnionException>
253+
AsyncUtil.Retry<NOnionException>
254254
connectToRendezvousJob
255255
maxRendezvousConnectRetryCount
256256

‎NOnion/Utility/FSharpUtil.fs renamed to ‎NOnion/Utility/AsyncUtil.fs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
namespace NOnion.Utility
22

33
open System
4-
open System.Runtime.ExceptionServices
54

6-
open FSharpx.Collections
75
open Fsdk
86

97
open NOnion
108

11-
module FSharpUtil =
9+
module AsyncUtil =
1210
let WithTimeout (timeSpan: TimeSpan) (job: Async<'R>) : Async<'R> =
1311
async {
1412
let! result = FSharpUtil.WithTimeout timeSpan job

0 commit comments

Comments
 (0)