Move ini parser as well

cmake/target_link_libraries_system.cmake

@@ -4,6 +4,6 @@ function(target_link_libraries_system target)
   foreach(lib ${libs})
     get_target_property(lib_include_dirs ${lib} INTERFACE_INCLUDE_DIRECTORIES)
     target_include_directories(${target} SYSTEM PUBLIC ${lib_include_dirs})
-    target_link_libraries(${target} ${lib})
+    target_link_libraries(${target} PUBLIC ${lib})
   endforeach(lib)
 endfunction()

llarp/CMakeLists.txt

@@ -1,4 +1,6 @@
 set(LIB_UTIL_SRC
+  config/config.cpp
+  config/ini.cpp
   constants/defaults.cpp
   constants/link_layer.cpp
   constants/path.cpp
@@ -13,7 +15,6 @@ set(LIB_UTIL_SRC
   util/encode.cpp
   util/endian.cpp
   util/fs.cpp
-  util/ini.cpp
   util/json.cpp
   util/logger.cpp
   util/android_logger.cpp
@@ -52,6 +53,7 @@ set(LIB_UTIL_SRC
 
 add_library(${UTIL_LIB} STATIC ${LIB_UTIL_SRC})
 target_include_directories(${UTIL_LIB} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/include)
+target_link_libraries(${UTIL_LIB} PUBLIC ${CRYPTOGRAPHY_LIB})
 target_link_libraries_system(${UTIL_LIB} absl::synchronization absl::hash absl::container nlohmann_json::nlohmann_json)
 
 # cut back on fluff
@@ -125,7 +127,6 @@ set(DNSLIB_SRC
 
 set(LIB_SRC
   ${DNSLIB_SRC}
-  config/config.cpp
   context.cpp
   crypto/constants.cpp
   crypto/crypto_libsodium.cpp

llarp/config/config.cpp

@@ -1,9 +1,9 @@
 #include <config/config.hpp>
 
+#include <config/ini.hpp>
 #include <constants/defaults.hpp>
 #include <net/net.hpp>
 #include <util/fs.hpp>
-#include <util/ini.hpp>
 #include <util/logger.hpp>
 #include <util/mem.hpp>
 

llarp/config/ini.cpp

@@ -1,8 +1,9 @@
-#include <util/ini.hpp>
+#include <config/ini.hpp>
+#include <util/logger.hpp>
+
 #include <fstream>
 #include <list>
 #include <iostream>
-#include <util/logger.hpp>
 
 #ifdef LoadString
 #undef LoadString

llarp/config/ini.hpp

@@ -1,9 +1,11 @@
 #ifndef LOKINET_BOOTSERV_CONFIG_HPP
 #define LOKINET_BOOTSERV_CONFIG_HPP
-#include <unordered_map>
+
 #include <util/string_view.hpp>
+
 #include <functional>
 #include <memory>
+#include <unordered_map>
 #include <vector>
 
 namespace llarp

llarp/service/config.cpp

@@ -1,6 +1,6 @@
 #include <service/config.hpp>
 
-#include <util/ini.hpp>
+#include <config/ini.hpp>
 
 namespace llarp
 {

test/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(TEST_EXE testAll)
 
 list(APPEND TEST_SRC
+    config/test_llarp_config_ini.cpp
     crypto/test_llarp_crypto_types.cpp
     crypto/test_llarp_crypto.cpp
     dht/test_llarp_dht_bucket.cpp
@@ -36,7 +37,6 @@ list(APPEND TEST_SRC
     util/test_llarp_util_bencode.cpp
     util/test_llarp_util_bits.cpp
     util/test_llarp_util_encode.cpp
-    util/test_llarp_util_ini.cpp
     util/test_llarp_util_metrics_core.cpp
     util/test_llarp_util_metrics_types.cpp
     util/test_llarp_util_memfn.cpp
@@ -72,4 +72,4 @@ endif(NOT WIN32)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
   target_link_directories(${TEST_EXE} PRIVATE /usr/local/lib)
-endif()
+endif()

test/config/test_llarp_config_ini.cpp

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include <util/ini.hpp>
+#include <config/ini.hpp>
 
 struct TestINIParser : public ::testing::Test
 {