Code review cleanup

Author: mpretty-cyro

src/config/contacts.cpp

@@ -313,10 +313,10 @@ blinded_contact_info::blinded_contact_info(
         comm{community(
                 std::move(community_base_url), blinded_id.substr(2), std::move(community_pubkey))} {
     auto prefix = get_session_id_prefix(blinded_id);
-    legacy_blinding = (prefix == session::SessionIdPrefix::community_blinded_legacy);
+    legacy_blinding = (prefix == session::SessionIDPrefix::community_blinded_legacy);
 
-    if (prefix != session::SessionIdPrefix::community_blinded &&
-        prefix != session::SessionIdPrefix::community_blinded_legacy)
+    if (prefix != session::SessionIDPrefix::community_blinded &&
+        prefix != session::SessionIDPrefix::community_blinded_legacy)
         throw std::invalid_argument{
                 "Invalid blinded ID: Expected '15' or '25' prefix; got " + std::string{blinded_id}};
 }

src/config/internal.cpp

@@ -17,26 +17,13 @@ namespace session::config {
 
 namespace {
 
-    constexpr std::array<session::SessionIdPrefix, 6> all_session_id_prefixes = {
-            session::SessionIdPrefix::standard,
-            session::SessionIdPrefix::group,
-            session::SessionIdPrefix::community_blinded_legacy,
-            session::SessionIdPrefix::community_blinded,
-            session::SessionIdPrefix::version_blinded,
-            session::SessionIdPrefix::unblinded};
-
-    inline std::string to_string(session::SessionIdPrefix prefix) {
-        switch (prefix) {
-            case session::SessionIdPrefix::unblinded: return "00";
-            case session::SessionIdPrefix::group: return "03";
-            case session::SessionIdPrefix::standard: return "05";
-            case session::SessionIdPrefix::community_blinded_legacy: return "15";
-            case session::SessionIdPrefix::community_blinded: return "25";
-            case session::SessionIdPrefix::version_blinded: return "07";
-        }
-
-        return "05";  // Fallback to standard, shouldn't occur
-    };
+    constexpr std::array all_session_id_prefixes = {
+            session::SessionIDPrefix::standard,
+            session::SessionIDPrefix::group,
+            session::SessionIDPrefix::community_blinded_legacy,
+            session::SessionIDPrefix::community_blinded,
+            session::SessionIDPrefix::version_blinded,
+            session::SessionIDPrefix::unblinded};
 
 }  // namespace
 
@@ -48,13 +35,10 @@ void check_session_id(std::string_view session_id, std::string_view prefix) {
                 "; got " + std::string{session_id}};
 }
 
-SessionIdPrefix get_session_id_prefix(std::string_view id) {
-    std::string prefix_list_str = "";
-
-    if (oxenc::is_hex(id)) {
+SessionIDPrefix get_session_id_prefix(std::string_view id) {
+    if (oxenc::is_hex(id) && id.size() == 66) {
         for (auto prefix : all_session_id_prefixes) {
             auto prefix_str = to_string(prefix);
-            prefix_list_str += (prefix_list_str.empty() ? prefix_str : ", {}"_format(prefix_str));
 
             if ((id.size() == 64 + prefix_str.size() &&
                  id.substr(0, prefix_str.size()) == prefix_str))
@@ -63,9 +47,10 @@ SessionIdPrefix get_session_id_prefix(std::string_view id) {
     }
 
     // If we get here then the id wasn't any of the currently defined prefixes
-    throw std::invalid_argument{
-            "Invalid session ID: expected 66 hex digits starting with one of [" + prefix_list_str +
-            "]; got " + std::string{id}};
+    throw std::invalid_argument{fmt::format(
+            "Invalid session ID: expected 66 hex digits starting with one of [{}]; got {}",
+            fmt::join(all_session_id_prefixes, ", "),
+            id)};
 }
 
 std::string session_id_to_bytes(std::string_view session_id, std::string_view prefix) {

src/config/internal.hpp

@@ -14,7 +14,7 @@
 
 namespace session {
 
-enum class SessionIdPrefix {
+enum class SessionIDPrefix {
     standard,
     group,
     community_blinded_legacy,
@@ -23,8 +23,21 @@ enum class SessionIdPrefix {
     unblinded,
 };
 
+inline constexpr std::string_view to_string(session::SessionIDPrefix prefix) {
+    switch (prefix) {
+        case session::SessionIDPrefix::unblinded: return "00"sv;
+        case session::SessionIDPrefix::group: return "03"sv;
+        case session::SessionIDPrefix::standard: return "05"sv;
+        case session::SessionIDPrefix::community_blinded_legacy: return "15"sv;
+        case session::SessionIDPrefix::community_blinded: return "25"sv;
+        case session::SessionIDPrefix::version_blinded: return "07"sv;
+    }
+
+    return "05"sv;  // Fallback to standard, shouldn't occur
 };
 
+};  // namespace session
+
 namespace session::config {
 
 template <typename ConfigT, typename... Args>
@@ -136,7 +149,7 @@ config_string_list* make_string_list(Container vals) {
 void check_session_id(std::string_view session_id, std::string_view prefix = "05");
 
 // Throws std::invalid_argument if id doesn't look valid.
-SessionIdPrefix get_session_id_prefix(std::string_view id);
+SessionIDPrefix get_session_id_prefix(std::string_view id);
 
 // Checks the session_id (throwing if invalid) then returns it as bytes
 std::string session_id_to_bytes(std::string_view session_id, std::string_view prefix = "05");
@@ -257,3 +270,14 @@ std::optional<std::vector<unsigned char>> zstd_decompress(
         std::span<const unsigned char> data, size_t max_size = 0);
 
 }  // namespace session::config
+
+namespace fmt {
+
+template <>
+struct formatter<session::SessionIDPrefix, char> : formatter<std::string_view> {
+    auto format(const session::SessionIDPrefix& val, fmt::format_context& ctx) const {
+        return formatter<std::string_view>::format(to_string(val), ctx);
+    }
+};
+
+}  // namespace fmt