Review fixes

Author: tompro

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

@@ -90,7 +90,7 @@ pub struct NostrConfig {
     pub only_known_contacts: bool,
     /// All relays we want to publish our messages to and receive messages from.
     pub relays: Vec<url::Url>,
-    /// Maximum number of contact relays to connect to (user relays are exempt).
+    /// Maximum number of contact relays to add (in addition to user relays which are always included).
     /// Defaults to 50 if not specified.
     pub max_relays: Option<usize>,
 }

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

@@ -1380,11 +1380,13 @@ fn calculate_relay_set_internal(
         _ => 2, // unreachable due to filter
     });
 
-    let limit = max_relays.unwrap_or(usize::MAX);
+    let contact_relay_limit = max_relays.unwrap_or(usize::MAX);
+    let user_relay_count = relay_set.len();
 
     // Pass 2: Add first relay from each contact (priority order)
     for contact in &eligible_contacts {
-        if relay_set.len() >= limit {
+        let contact_relays_added = relay_set.len() - user_relay_count;
+        if contact_relays_added >= contact_relay_limit {
             break;
         }
         if let Some(first_relay) = contact.relays.first() {
@@ -1395,7 +1397,8 @@ fn calculate_relay_set_internal(
     // Pass 3: Fill remaining slots with additional contact relays
     for contact in &eligible_contacts {
         for relay in contact.relays.iter().skip(1) {
-            if relay_set.len() >= limit {
+            let contact_relays_added = relay_set.len() - user_relay_count;
+            if contact_relays_added >= contact_relay_limit {
                 return relay_set;
             }
             relay_set.insert(relay.clone());
@@ -1458,6 +1461,30 @@ mod relay_calculation_tests {
         assert!(result.contains(&url::Url::parse("wss://trusted.com").unwrap()));
     }
 
+    #[test]
+    fn test_contact_relays_added_when_user_relays_exceed_limit() {
+        let user_relays = vec![
+            url::Url::parse("wss://user1.com").unwrap(),
+            url::Url::parse("wss://user2.com").unwrap(),
+            url::Url::parse("wss://user3.com").unwrap(),
+        ];
+        let contacts = vec![
+            create_test_contact(TrustLevel::Trusted, vec!["wss://contact1.com"]),
+            create_test_contact(TrustLevel::Trusted, vec!["wss://contact2.com"]),
+        ];
+        let max_relays = Some(2); // Lower than user relay count
+
+        let result = calculate_relay_set_internal(&user_relays, &contacts, max_relays);
+
+        // Should have all 3 user relays + 2 contact relays (user relays exempt from limit)
+        assert_eq!(result.len(), 5);
+        assert!(result.contains(&url::Url::parse("wss://user1.com").unwrap()));
+        assert!(result.contains(&url::Url::parse("wss://user2.com").unwrap()));
+        assert!(result.contains(&url::Url::parse("wss://user3.com").unwrap()));
+        assert!(result.contains(&url::Url::parse("wss://contact1.com").unwrap()));
+        assert!(result.contains(&url::Url::parse("wss://contact2.com").unwrap()));
+    }
+
     #[test]
     fn test_one_relay_per_contact_guaranteed() {
         let user_relays = vec![];

crates/bcr-ebill-wasm/src/lib.rs

@@ -37,6 +37,7 @@ pub struct Config {
     pub esplora_base_url: String,
     pub nostr_relays: Vec<String>,
     pub nostr_only_known_contacts: Option<bool>,
+    pub nostr_max_relays: Option<usize>,
     pub job_runner_initial_delay_seconds: u32,
     pub job_runner_check_interval_seconds: u32,
     pub transport_initial_subscription_delay_seconds: Option<u32>,
@@ -131,7 +132,7 @@ pub async fn initialize_api(
         nostr_config: NostrConfig {
             relays: nostr_relays,
             only_known_contacts: config.nostr_only_known_contacts.unwrap_or(false),
-            max_relays: Some(50),
+            max_relays: config.nostr_max_relays.or(Some(50)),
         },
         mint_config: MintConfig::new(config.default_mint_url, mint_node_id)?,
         payment_config: PaymentConfig {