Merge pull request #33 from mpretty-cyro/fix/local-target-for-network-tests

Fix flaky network tests

Author: mpretty-cyro

external/CMakeLists.txt

@@ -102,7 +102,7 @@ endif()
 
 set(LIBQUIC_BUILD_TESTS OFF CACHE BOOL "")
 if(ENABLE_ONIONREQ)
-  libsession_system_or_submodule(OXENQUIC quic liboxenquic>=1.2.0 oxen-libquic)
+  libsession_system_or_submodule(OXENQUIC quic liboxenquic>=1.3.0 oxen-libquic)
 endif()
 
 if(NOT TARGET oxenc::oxenc)

external/oxen-libquic

@@ -86,7 +86,7 @@ struct service_node : public oxen::quic::RemoteAddress {
 struct connection_info {
     service_node node;
     std::shared_ptr<size_t> pending_requests;
-    std::shared_ptr<oxen::quic::connection_interface> conn;
+    std::shared_ptr<oxen::quic::Connection> conn;
     std::shared_ptr<oxen::quic::BTRequestStream> stream;
 
     bool is_valid() const { return conn && stream && !stream->is_closing(); };
@@ -204,10 +204,10 @@ class Network {
     std::thread disk_write_thread;
 
     // General values
-    bool destroyed = false;
     bool suspended = false;
     ConnectionStatus status;
-    oxen::quic::Network net;
+
+    std::shared_ptr<oxen::quic::Loop> loop;
     std::shared_ptr<oxen::quic::Endpoint> endpoint;
     std::unordered_map<PathType, std::vector<onion_path>> paths;
     std::vector<std::pair<onion_path, PathType>> paths_pending_drop;
@@ -672,7 +672,7 @@ class Network {
     /// Outputs:
     /// - A tuple containing the status code, headers and body of the decrypted onion request
     /// response.
-    std::tuple<
+    virtual std::tuple<
             int16_t,
             std::vector<std::pair<std::string, std::string>>,
             std::optional<std::string>>
@@ -689,7 +689,7 @@ class Network {
     /// Outputs:
     /// - A tuple containing the status code, headers and body of the decrypted onion request
     /// response.
-    std::tuple<
+    virtual std::tuple<
             int16_t,
             std::vector<std::pair<std::string, std::string>>,
             std::optional<std::string>>

include/session/session_network.hpp

@@ -118,7 +118,7 @@ if(ENABLE_ONIONREQ)
     )
 
     if (BUILD_STATIC_DEPS)
-        target_include_directories(onionreq PRIVATE ${CMAKE_BINARY_DIR}/static-deps/include)
+        target_include_directories(onionreq PUBLIC ${CMAKE_BINARY_DIR}/static-deps/include)
     endif()
 endif()