Merge pull request #41 from mpretty-cyro/fix/xcode-debugger-name-collision

Renaming 'network' to 'session_network' because xcode can't debug

Author: mpretty-cyro

include/session/network.h renamed to include/session/session_network.h

@@ -104,7 +104,7 @@ if(ENABLE_ONIONREQ)
         onionreq/key_types.cpp
         onionreq/parser.cpp
         onionreq/response_parser.cpp
-        network.cpp
+        session_network.cpp
     )
 
     target_link_libraries(onionreq

include/session/network.hpp renamed to include/session/session_network.hpp

@@ -22,10 +22,10 @@
 #include <oxen/quic/address.hpp>
 
 #include "session/export.h"
-#include "session/network.hpp"
 #include "session/onionreq/builder.h"
 #include "session/onionreq/hop_encryption.hpp"
 #include "session/onionreq/key_types.hpp"
+#include "session/session_network.hpp"
 #include "session/util.hpp"
 #include "session/xed25519.hpp"
 

src/CMakeLists.txt

@@ -1,4 +1,4 @@
-#include "session/network.hpp"
+#include "session/session_network.hpp"
 
 #include <fmt/ranges.h>
 #include <oxenc/base64.h>
@@ -24,11 +24,11 @@
 #include "session/ed25519.hpp"
 #include "session/export.h"
 #include "session/file.hpp"
-#include "session/network.h"
 #include "session/onionreq/builder.h"
 #include "session/onionreq/builder.hpp"
 #include "session/onionreq/key_types.hpp"
 #include "session/onionreq/response_parser.hpp"
+#include "session/session_network.h"
 #include "session/util.hpp"
 
 using namespace oxen;

src/onionreq/builder.cpp

@@ -30,7 +30,7 @@ set(LIB_SESSION_UTESTS_SOURCES
 )
 
 if (ENABLE_ONIONREQ)
-    list(APPEND LIB_SESSION_UTESTS_SOURCES test_network.cpp)
+    list(APPEND LIB_SESSION_UTESTS_SOURCES test_session_network.cpp)
     list(APPEND LIB_SESSION_UTESTS_SOURCES test_onionreq.cpp)
 endif()
 

src/network.cpp renamed to src/session_network.cpp

@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
-#include <session/network.hpp>
 #include <session/onionreq/hop_encryption.hpp>
 #include <session/onionreq/parser.hpp>
+#include <session/session_network.hpp>
 
 #include "utils.hpp"
 

tests/CMakeLists.txt

@@ -1,12 +1,12 @@
 #include <fmt/core.h>
-#include <session/network.h>
+#include <session/session_network.h>
 #include <sodium/randombytes.h>
 
 #include <catch2/catch_test_macros.hpp>
 #include <chrono>
 #include <nlohmann/json.hpp>
-#include <session/network.hpp>
 #include <session/onionreq/key_types.hpp>
+#include <session/session_network.hpp>
 #include <tuple>
 
 #include "utils.hpp"