Remove unneeded libraries; add in WolfSSL

iggy-rs · Feb 23, 2024 · d16b1a7 · d16b1a7
1 parent 8501446
commit d16b1a7
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 59 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,17 +10,12 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
 endif()
 
 # set up library dependencies
-find_package(benchmark CONFIG REQUIRED)
-find_package(cpptoml CONFIG REQUIRED)
 find_package(libuv CONFIG REQUIRED)
-find_package(OpenSSL REQUIRED)
 find_package(spdlog CONFIG REQUIRED)
 find_package(unofficial-sodium CONFIG REQUIRED)
 
 # these do not correctly support CMake
 find_path(SODIUM_INCLUDE_DIR sodium.h REQUIRED)
-find_path(USOCKETS_INCLUDE_DIR libusockets.h REQUIRED)
-find_library(USOCKETS_LIB uSockets REQUIRED)
 
 add_library(
   iggy

diff --git a/fuzz/CMakeLists.txt b/fuzz/CMakeLists.txt
diff --git a/fuzz/pub_client.cc b/fuzz/pub_client.cc
diff --git a/sdk/client.cc b/sdk/client.cc
@@ -3,23 +3,9 @@
 #include <string>
 #include <vector>
 
-/* Loop wakeup handler */
-void on_wakeup(struct us_loop_t* loop) {}
-
-/* Loop pre iteration handler */
-void on_pre(struct us_loop_t* loop) {}
-
-/* Loop post iteration handler */
-void on_post(struct us_loop_t* loop) {}
-
 iggy::client::Client::Client(Options& options) {
     // to make more natural interface for setting options we use a struct, so need to validate it.
     options.validate();
-
-    // does nothing for now, but will be used to set up the client connection with uSockets
-    struct us_loop_t* loop = us_create_loop(0, on_wakeup, on_pre, on_post, 0);
-    us_loop_run(loop);
-    us_loop_free(loop);
 }
 
 void iggy::client::Client::ping() {

diff --git a/sdk/client.h b/sdk/client.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <libusockets.h>
 #include <sodium.h>
 #include <stdexcept>
 #include <string>

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -28,9 +28,6 @@ if(BUILD_TESTS)
     libuv::uv_a
     reproc++
     unofficial-sodium::sodium
-    ${USOCKETS_LIB}
-    OpenSSL::SSL
-    OpenSSL::Crypto
   )
 
   add_executable(
@@ -49,9 +46,6 @@ if(BUILD_TESTS)
     libuv::uv_a
     reproc++
     unofficial-sodium::sodium
-    ${USOCKETS_LIB}
-    OpenSSL::SSL
-    OpenSSL::Crypto
   )
 
   include(GoogleTest)

diff --git a/vcpkg.json b/vcpkg.json
@@ -1,18 +1,10 @@
 {
   "dependencies": [
-    "benchmark",
-    "cpptoml",
-    "fmt",
     "icu",
     "libsodium",
-    "nlohmann-json",
+    "libuv",
     "reproc",
     "spdlog",
-    {
-      "name": "usockets",
-      "features": [
-        "ssl"
-      ]
-    }
+    "wolfssl"
   ]
 }