Remove Join() helper only used in tests

Also remove redundant return type that can be deduced by the compiler.

2 files changed, 3 insertions, 10 deletions

diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index 70e2f89e0b..a16280f8c6 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -238,9 +238,9 @@ BOOST_AUTO_TEST_CASE(span_write_bytes)
 BOOST_AUTO_TEST_CASE(util_Join)
 {
     // Normal version
-    BOOST_CHECK_EQUAL(Join({}, ", "), "");
-    BOOST_CHECK_EQUAL(Join({"foo"}, ", "), "foo");
-    BOOST_CHECK_EQUAL(Join({"foo", "bar"}, ", "), "foo, bar");
+    BOOST_CHECK_EQUAL(Join(std::vector<std::string>{}, ", "), "");
+    BOOST_CHECK_EQUAL(Join(std::vector<std::string>{"foo"}, ", "), "foo");
+    BOOST_CHECK_EQUAL(Join(std::vector<std::string>{"foo", "bar"}, ", "), "foo, bar");
 
     // Version with unary operator
     const auto op_upper = [](const std::string& s) { return ToUpper(s); };
diff --git a/src/util/string.h b/src/util/string.h
index dd4de888bb..f8d36493b8 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -66,7 +66,6 @@ void ReplaceAll(std::string& in_out, const std::string& search, const std::strin
  */
 template <typename T, typename BaseType, typename UnaryOp>
 auto Join(const std::vector<T>& list, const BaseType& separator, UnaryOp unary_op)
-    -> decltype(unary_op(list.at(0)))
 {
     decltype(unary_op(list.at(0))) ret;
     for (size_t i = 0; i < list.size(); ++i) {
@@ -82,12 +81,6 @@ T Join(const std::vector<T>& list, const T2& separator)
     return Join(list, separator, [](const T& i) { return i; });
 }
 
-// Explicit overload needed for c_str arguments, which would otherwise cause a substitution failure in the template above.
-inline std::string Join(const std::vector<std::string>& list, std::string_view separator)
-{
-    return Join<std::string>(list, separator);
-}
-
 /**
  * Create an unordered multi-line list of items.
  */