Missed a legacy_blinding flag

Author: mpretty-cyro

include/session/config/contacts.h

@@ -350,8 +350,7 @@ LIBSESSION_EXPORT bool contacts_set_blinded(
 /// BOOL contacts_erase_blinded(
 ///     [in, out]   config_object*  conf,
 ///     [in]        const char*     community_base_url,
-///     [in]        const char*     blinded_id,
-///     [in]        bool            legacy_blinding
+///     [in]        const char*     blinded_id
 /// );
 /// ```
 ///
@@ -365,10 +364,7 @@ LIBSESSION_EXPORT bool contacts_set_blinded(
 /// Outputs:
 /// - `bool` -- True if erasing was successful
 LIBSESSION_EXPORT bool contacts_erase_blinded_contact(
-        config_object* conf,
-        const char* community_base_url,
-        const char* blinded_id,
-        bool legacy_blinding);
+        config_object* conf, const char* community_base_url, const char* blinded_id);
 
 typedef struct contacts_iterator {
     void* _internals;

include/session/config/contacts.hpp

@@ -530,12 +530,10 @@ class Contacts : public ConfigBase {
     /// Inputs:
     /// - `base_url` -- the base url for the community this blinded contact originated from
     /// - `blinded_id` -- hex string of the blinded id
-    /// - `legacy_blinding` -- flag indicating whether `blinded_id` is using legacy blinding
     ///
     /// Outputs:
     /// - `bool` - Returns true if contact was found and removed, false otherwise
-    bool erase_blinded(
-            std::string_view base_url, std::string_view blinded_id, bool legacy_blinding);
+    bool erase_blinded(std::string_view base_url, std::string_view blinded_id);
 
     struct iterator;
     /// API: contacts/contacts::begin

src/config/contacts.cpp

@@ -479,9 +479,13 @@ void Contacts::set_blinded(const blinded_contact_info& bc) {
     set_ts(info["j"], bc.created);
 }
 
-bool Contacts::erase_blinded(
-        std::string_view base_url_, std::string_view blinded_id, bool legacy_blinding) {
-    check_session_id(blinded_id, legacy_blinding ? "15" : "25");
+bool Contacts::erase_blinded(std::string_view base_url_, std::string_view blinded_id) {
+    auto prefix = get_session_id_prefix(blinded_id);
+
+    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}};
 
     auto base_url = community::canonical_url(base_url_);
     auto pk = std::string(blinded_id.substr(2));
@@ -679,13 +683,9 @@ LIBSESSION_C_API bool contacts_set_blinded(
 }
 
 LIBSESSION_C_API bool contacts_erase_blinded(
-        config_object* conf,
-        const char* community_base_url,
-        const char* blinded_id,
-        bool legacy_blinding) {
+        config_object* conf, const char* community_base_url, const char* blinded_id) {
     try {
-        return unbox<Contacts>(conf)->erase_blinded(
-                community_base_url, blinded_id, legacy_blinding);
+        return unbox<Contacts>(conf)->erase_blinded(community_base_url, blinded_id);
     } catch (...) {
         return false;
     }

tests/test_config_contacts.cpp

@@ -1016,7 +1016,7 @@ TEST_CASE("Contacts", "[config][blinded_contacts]") {
     // Conflict! Oh no!
 
     // On client 1 delete a contact:
-    CHECK(contacts.erase_blinded(comm_base_url, definitely_real_id, true));
+    CHECK(contacts.erase_blinded(comm_base_url, definitely_real_id));
 
     // Client 2 adds a new friend:
     auto third_id = "152222222222222222222222222222222222222222222222222222222222222222"sv;