fixup

aarani · Oct 28, 2023 · 7978b5e · 7978b5e
1 parent 4aac077
commit 7978b5e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/NOnion.Tests/HiddenServicesTests.cs b/NOnion.Tests/HiddenServicesTests.cs
@@ -25,7 +25,7 @@ namespace NOnion.Tests
 {
     public class HiddenServicesTests
     {
-        [SetUp]
+        [OneTimeSetUp]
         public void Init()
         {
             cachePath =

diff --git a/NOnion/Client/TorClient.fs b/NOnion/Client/TorClient.fs
@@ -129,10 +129,11 @@ type TorClient internal (directory: TorDirectory) =
 
     member __.Directory = directory
 
-    member __.AsyncCreateCircuit
+    member internal __.AsyncCreateCircuitWithCallback
         (hopsCount: int)
         (purpose: CircuitPurpose)
         (extendByNodeOpt: Option<CircuitNodeDetail>)
+        (serviceStream: uint16 -> TorCircuit -> Async<unit>)
         =
         async {
             let rec createNewGuard() =
@@ -160,7 +161,7 @@ type TorClient internal (directory: TorDirectory) =
                     else
                         try
                             let! guard, guardDetail = createNewGuard()
-                            let circuit = TorCircuit guard
+                            let circuit = TorCircuit(guard, serviceStream)
 
                             do!
                                 circuit.Create guardDetail
@@ -245,6 +246,20 @@ type TorClient internal (directory: TorDirectory) =
             return! tryCreateCircuit startTryNumber
         }
 
+    member self.AsyncCreateCircuit
+        (hopsCount: int)
+        (purpose: CircuitPurpose)
+        (extendByNodeOpt: Option<CircuitNodeDetail>)
+        =
+        let noop _ _ =
+            async { return () }
+
+        self.AsyncCreateCircuitWithCallback
+            hopsCount
+            purpose
+            extendByNodeOpt
+            noop
+
     member self.CreateCircuitAsync
         (
             hopsCount: int,

diff --git a/NOnion/Services/TorServiceHost.fs b/NOnion/Services/TorServiceHost.fs
@@ -132,10 +132,11 @@ type TorServiceHost
                     )
 
                 let! rendezvousCircuit =
-                    client.AsyncCreateCircuit
+                    client.AsyncCreateCircuitWithCallback
                         2
                         CircuitPurpose.Unknown
                         (Some lastNodeDetails)
+                        self.IncomingServiceStreamCallback
 
                 do!
                     rendezvousCircuit.Rendezvous