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

mpretty-cyro · mpretty-cyro · commit faf931cf9fc8 · 2025-04-09T15:59:32.000+10:00
diff --git a/include/session/session_network.h b/include/session/session_network.h
diff --git a/include/session/session_network.hpp b/include/session/session_network.hpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -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
diff --git a/src/onionreq/builder.cpp b/src/onionreq/builder.cpp
@@ -22,7 +22,7 @@
 #include <oxen/quic/address.hpp>
 
 #include "session/export.h"
-#include "session/network.hpp"
+#include "session/session_network.hpp"
 #include "session/onionreq/builder.h"
 #include "session/onionreq/hop_encryption.hpp"
 #include "session/onionreq/key_types.hpp"
diff --git a/src/session_network.cpp b/src/session_network.cpp
@@ -1,4 +1,4 @@
-#include "session/network.hpp"
+#include "session/session_network.hpp"
 
 #include <fmt/ranges.h>
 #include <oxenc/base64.h>
@@ -24,7 +24,7 @@
 #include "session/ed25519.hpp"
 #include "session/export.h"
 #include "session/file.hpp"
-#include "session/network.h"
+#include "session/session_network.h"
 #include "session/onionreq/builder.h"
 #include "session/onionreq/builder.hpp"
 #include "session/onionreq/key_types.hpp"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -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()
 
diff --git a/tests/test_onionreq.cpp b/tests/test_onionreq.cpp
@@ -1,5 +1,5 @@
 #include <catch2/catch_test_macros.hpp>
-#include <session/network.hpp>
+#include <session/session_network.hpp>
 #include <session/onionreq/hop_encryption.hpp>
 #include <session/onionreq/parser.hpp>
 
diff --git a/tests/test_session_network.cpp b/tests/test_session_network.cpp
@@ -1,11 +1,11 @@
 #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/session_network.hpp>
 #include <session/onionreq/key_types.hpp>
 #include <tuple>
 

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ if(ENABLE_ONIONREQ)`
`104`	`104`	`onionreq/key_types.cpp`
`105`	`105`	`onionreq/parser.cpp`
`106`	`106`	`onionreq/response_parser.cpp`
`107`		`- network.cpp`
	`107`	`+ session_network.cpp`
`108`	`108`	`)`
`109`	`109`
`110`	`110`	`target_link_libraries(onionreq`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ set(LIB_SESSION_UTESTS_SOURCES`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`if (ENABLE_ONIONREQ)`
`33`		`- list(APPEND LIB_SESSION_UTESTS_SOURCES test_network.cpp)`
	`33`	`+ list(APPEND LIB_SESSION_UTESTS_SOURCES test_session_network.cpp)`
`34`	`34`	`list(APPEND LIB_SESSION_UTESTS_SOURCES test_onionreq.cpp)`
`35`	`35`	`endif()`
`36`	`36`