Review fixes

Author: tompro

crates/bcr-ebill-api/src/constants.rs

@@ -8,3 +8,4 @@ pub const VALID_FILE_MIME_TYPES: [&str; 3] = ["image/jpeg", "image/png", "applic
 // When subscribing events we subtract this from the last received event time
 pub const NOSTR_EVENT_TIME_SLACK: u64 = 3600 * 24 * 7; // 1 week
 pub const DEFAULT_INITIAL_SUBSCRIPTION_DELAY_SECONDS: u32 = 1;
+pub const NOSTR_MAX_RELAYS: usize = 200;

crates/bcr-ebill-persistence/src/db/nostr_contact_store.rs

@@ -19,6 +19,7 @@ use bcr_ebill_core::{
     protocol::SecretKey,
     protocol::Timestamp,
 };
+use log::error;
 use serde::{Deserialize, Serialize};
 use surrealdb::sql::Thing;
 
@@ -70,9 +71,15 @@ impl NostrContactStoreApi for SurrealNostrContactStore {
         let result: Vec<NostrContactDb> = self.db.select_all(Self::TABLE).await?;
         let values = result
             .into_iter()
-            .map(|c| c.to_owned().try_into().ok())
-            .collect::<Option<Vec<NostrContact>>>();
-        Ok(values.unwrap_or_default())
+            .filter_map(|c| match c.try_into() {
+                Ok(v) => Some(v),
+                Err(e) => {
+                    error!("Failed to convert NostrContactDb to NostrContact: {e}");
+                    None
+                }
+            })
+            .collect::<Vec<NostrContact>>();
+        Ok(values)
     }
 
     /// Find a Nostr contact by the npub. This is the public Nostr key of the contact.

crates/bcr-ebill-transport/src/nostr.rs

@@ -9,8 +9,12 @@ use crate::{
 use async_trait::async_trait;
 use bcr_common::core::NodeId;
 use bcr_ebill_core::{
-    protocol::Timestamp, protocol::blockchain::BlockchainType,
-    protocol::blockchain::bill::participant::BillParticipant, protocol::crypto::BcrKeys,
+    application::nostr_contact::{NostrContact, TrustLevel},
+    protocol::{
+        Timestamp,
+        blockchain::{BlockchainType, bill::participant::BillParticipant},
+        crypto::BcrKeys,
+    },
 };
 use bitcoin::base58;
 use log::{debug, error, info, trace, warn};
@@ -27,7 +31,7 @@ use std::{
 };
 
 use bcr_ebill_api::{
-    constants::NOSTR_EVENT_TIME_SLACK,
+    constants::{NOSTR_EVENT_TIME_SLACK, NOSTR_MAX_RELAYS},
     service::{
         contact_service::ContactServiceApi,
         transport_service::{
@@ -358,8 +362,8 @@ impl NostrClient {
         let current_relays: HashSet<url::Url> = client
             .relays()
             .await
-            .into_iter()
-            .filter_map(|(_, relay)| relay.url().as_str().parse::<url::Url>().ok())
+            .keys()
+            .map(|url| url.to_owned().into())
             .collect();
 
         // Add new relays
@@ -1353,12 +1357,9 @@ mod tests {
 /// Internal relay calculation function (pure function for testing)
 fn calculate_relay_set_internal(
     user_relays: &[url::Url],
-    contacts: &[bcr_ebill_core::application::nostr_contact::NostrContact],
+    contacts: &[NostrContact],
     max_relays: Option<usize>,
 ) -> HashSet<url::Url> {
-    use bcr_ebill_core::application::nostr_contact::TrustLevel;
-    use std::collections::HashSet;
-
     let mut relay_set = HashSet::new();
 
     // Pass 1: Add all user relays (exempt from limit)
@@ -1367,11 +1368,10 @@ fn calculate_relay_set_internal(
     }
 
     // Filter and sort contacts by trust level
-    let mut eligible_contacts: Vec<&bcr_ebill_core::application::nostr_contact::NostrContact> =
-        contacts
-            .iter()
-            .filter(|c| matches!(c.trust_level, TrustLevel::Trusted | TrustLevel::Participant))
-            .collect();
+    let mut eligible_contacts: Vec<&NostrContact> = contacts
+        .iter()
+        .filter(|c| matches!(c.trust_level, TrustLevel::Trusted | TrustLevel::Participant))
+        .collect();
 
     // Sort: Trusted (0) before Participant (1)
     eligible_contacts.sort_by_key(|c| match c.trust_level {
@@ -1380,7 +1380,7 @@ fn calculate_relay_set_internal(
         _ => 2, // unreachable due to filter
     });
 
-    let contact_relay_limit = max_relays.unwrap_or(usize::MAX);
+    let contact_relay_limit = NOSTR_MAX_RELAYS.min(max_relays.unwrap_or(NOSTR_MAX_RELAYS));
     let user_relay_count = relay_set.len();
 
     // Pass 2: Add first relay from each contact (priority order)