Merge pull request #43 from aarani/wip/noSemaphore

Network,Utility: remove usage of SemaphoreLocker
nblockchain · Oct 21, 2022 · eedb0a8 · eedb0a8
2 parents 51bdb10 + 098a925
commit eedb0a8
Show file tree

Hide file tree

Showing 10 changed files with 1,514 additions and 1,063 deletions.
diff --git a/NOnion/Constants.fs b/NOnion/Constants.fs
@@ -82,6 +82,9 @@ module Constants =
     // Time limit used for Create and Extend operations
     let internal CircuitOperationTimeout = TimeSpan.FromSeconds 10.
 
+    // Time limit used for RendezvousJoin operation
+    let internal CircuitRendezvousTimeout = TimeSpan.FromMinutes 2.
+
     // Time limit used for StreamBegin operation
     let internal StreamCreationTimeout = TimeSpan.FromSeconds 10.
 

diff --git a/NOnion/Http/TorHttpClient.fs b/NOnion/Http/TorHttpClient.fs
@@ -7,6 +7,7 @@ open System.IO.Compression
 
 open NOnion
 open NOnion.Network
+open NOnion.Utility
 
 type TorHttpClient(stream: TorStream, host: string) =
 

diff --git a/NOnion/NOnion.fsproj b/NOnion/NOnion.fsproj
@@ -19,6 +19,8 @@
     <Compile Include="Exceptions.fs" />
     <Compile Include="HandshakeType.fs" />
     <Compile Include="Utility\FSharpUtil.fs" />
+    <Compile Include="Utility\ResultUtil.fs" />
+    <Compile Include="Utility\MailboxUtil.fs" />
     <Compile Include="Utility\StreamUtil.fs" />
     <Compile Include="Utility\SemaphoreLocker.fs" />
     <Compile Include="Utility\Base64Util.fs" />
@@ -97,7 +99,7 @@
 
   <Target Name="CopyProjectReferencesToPackage" DependsOnTargets="ResolveReferences">
     <ItemGroup>
-      <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />
+      <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/NOnion/Network/StreamState.fs b/NOnion/Network/StreamState.fs
@@ -10,11 +10,9 @@ type StreamState =
         streamId: uint16 *
         completionTask: TaskCompletionSource<uint16>
     | Connected of streamId: uint16
-    | Ended of streamId: uint16 * reason: EndReason
 
     member self.Id =
         match self with
         | Connecting(streamId, _)
-        | Connected streamId
-        | Ended(streamId, _) -> string streamId
+        | Connected streamId -> string streamId
         | Initialized -> "TBD"