Add make_vector to tests

XRPLF · Oct 23, 2023 · dff8113 · dff8113
1 parent dc77c4f
commit dff8113
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/test/basics/PerfLog_test.cpp b/src/test/basics/PerfLog_test.cpp
@@ -25,6 +25,7 @@
 #include <ripple/protocol/jss.h>
 #include <ripple/rpc/impl/Handler.h>
 #include <test/jtx/Env.h>
+#include <test/jtx/TestHelpers.h>
 
 #include <atomic>
 #include <chrono>
@@ -309,9 +310,8 @@ class PerfLog_test : public beast::unit_test::suite
 
         // Get the all the labels we can use for RPC interfaces without
         // causing an assert.
-        std::set<const char*> handlerNames = ripple::RPC::getHandlerNames();
-        std::vector<char const*> labels(
-            handlerNames.begin(), handlerNames.end());
+        std::vector<char const*> labels =
+            test::jtx::make_vector(ripple::RPC::getHandlerNames());
         std::shuffle(labels.begin(), labels.end(), default_prng());
 
         // Get two IDs to associate with each label.  Errors tend to happen at

diff --git a/src/test/jtx/TestHelpers.h b/src/test/jtx/TestHelpers.h
@@ -27,10 +27,19 @@
 #include <ripple/protocol/jss.h>
 #include <test/jtx/Env.h>
 
+#include <ranges>
+
 namespace ripple {
 namespace test {
 namespace jtx {
 
+// Helper to make vector from iterable
+auto
+make_vector(auto const& input) requires std::ranges::range<decltype(input)>
+{
+    return std::vector(std::ranges::begin(input), std::ranges::end(input));
+}
+
 // Functions used in debugging
 Json::Value
 getAccountOffers(Env& env, AccountID const& acct, bool current = false);

diff --git a/src/test/rpc/Handler_test.cpp b/src/test/rpc/Handler_test.cpp
@@ -99,9 +99,8 @@ class Handler_test : public beast::unit_test::suite
         std::random_device dev;
         std::ranlux48 prng(dev());
 
-        std::set<const char*> handlerNames = RPC::getHandlerNames();
-        std::vector<const char*> names(
-            handlerNames.begin(), handlerNames.end());
+        std::vector<const char*> names =
+            test::jtx::make_vector(ripple::RPC::getHandlerNames());
 
         std::uniform_int_distribution<std::size_t> distr{0, names.size() - 1};