diff --git a/support/include/utils/common.hpp b/support/include/utils/common.hpp index 1b81fd43..488497cb 100644 --- a/support/include/utils/common.hpp +++ b/support/include/utils/common.hpp @@ -74,11 +74,9 @@ template [[nodiscard]] inline auto generate_random_between(data_t begin, data_t end) -> data_t; -#if defined(PROJECT_ENABLE_LIBSODIUM) [[nodiscard]] auto generate_random_string(std::size_t length) -> std::string; [[nodiscard]] auto generate_random_wstring(std::size_t length) -> std::wstring; -#endif // defined(PROJECT_ENABLE_LIBSODIUM) [[nodiscard]] auto get_environment_variable(std::string_view variable) -> std::string; diff --git a/support/src/utils/common.cpp b/support/src/utils/common.cpp index dc3648a9..a919a83c 100644 --- a/support/src/utils/common.cpp +++ b/support/src/utils/common.cpp @@ -83,7 +83,6 @@ auto create_uuid_wstring() -> std::wstring { } #endif // defined(PROJECT_ENABLE_STDUUID) -#if defined(PROJECT_ENABLE_LIBSODIUM) auto generate_random_string(std::size_t length) -> std::string { std::string ret; if (length == 0U) { @@ -98,9 +97,7 @@ auto generate_random_string(std::size_t length) -> std::string { generate_random_between(97U, 255U), }; ch = static_cast( - random_list.at(repertory::utils::generate_random_between(0U, 2U)) % - 74U + - 48U); + random_list.at(generate_random_between(0U, 2U)) % 74U + 48U); } return ret; @@ -109,7 +106,6 @@ auto generate_random_string(std::size_t length) -> std::string { auto generate_random_wstring(std::size_t length) -> std::wstring { return utils::string::from_utf8(generate_random_string(length)); } -#endif // defined(PROJECT_ENABLE_LIBSODIUM) auto get_environment_variable(std::string_view variable) -> std::string { static std::mutex mtx{}; diff --git a/support/test/src/utils/common_test.cpp b/support/test/src/utils/common_test.cpp index f07eabb3..7a67f1cb 100644 --- a/support/test/src/utils/common_test.cpp +++ b/support/test/src/utils/common_test.cpp @@ -238,7 +238,6 @@ TEST(utils_common, generate_random_between_throws_error_on_invalid_range) { std::range_error); } -#if defined(PROJECT_ENABLE_LIBSODIUM) TEST(utils_common, generate_random_string) { static constexpr const auto max_iterations{10000L}; @@ -266,7 +265,6 @@ TEST(utils_common, generate_random_string_for_zero_length) { EXPECT_TRUE(utils::generate_random_string(0U).empty()); EXPECT_TRUE(utils::generate_random_wstring(0U).empty()); } -#endif // defined(PROJECT_ENABLE_LIBSODIUM) TEST(utils_common, get_environment_variable) { static constexpr const std::string path_env{"PATH"};