15449745260

Committed 04 Jun 2025 06:20PM UTC coverage: 85.058% (+0.003%) from 85.055%

Build # 15449745260

Build Type

Pull #726

github

Committed by

web-flow

Commit Message

Merge 315a4f504 into 1063687eb

Pull Request Pull Request #726: Merge parallel feature flag local certificate logic in cli ohttp

Run Details

58 of 71 new or added lines in 4 files covered. (81.69%)

12 existing lines in 1 file now uncovered.

6831 of 8031 relevant lines covered (85.06%)

577.91 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

80.0

/payjoin-cli/src/app/v2/ohttp.rs

use std::sync::{Arc, Mutex};

use anyhow::{anyhow, Result};

use super::Config;

#[derive(Debug, Clone)]
pub struct RelayManager {
    selected_relay: Option<payjoin::Url>,
    failed_relays: Vec<payjoin::Url>,
}

impl RelayManager {
    pub fn new() -> Self { RelayManager { selected_relay: None, failed_relays: Vec::new() } }

    pub fn set_selected_relay(&mut self, relay: payjoin::Url) { self.selected_relay = Some(relay); }

    pub fn get_selected_relay(&self) -> Option<payjoin::Url> { self.selected_relay.clone() }

    pub fn add_failed_relay(&mut self, relay: payjoin::Url) { self.failed_relays.push(relay); }

    pub fn get_failed_relays(&self) -> Vec<payjoin::Url> { self.failed_relays.clone() }
}

pub(crate) struct ValidatedOhttpKeys {
    pub(crate) ohttp_keys: payjoin::OhttpKeys,
    pub(crate) relay_url: payjoin::Url,
}

pub(crate) async fn unwrap_ohttp_keys_or_else_fetch(
    config: &Config,
    relay_state: Arc<Mutex<RelayManager>>,
) -> Result<ValidatedOhttpKeys> {
    let config_keys = config.v2()?.ohttp_keys.clone();
    let mut fetched_keys = fetch_ohttp_keys(config, relay_state).await?;

    if let Some(keys) = config_keys {
        fetched_keys.ohttp_keys = keys;
    }

    Ok(fetched_keys)
}

async fn fetch_ohttp_keys(
    config: &Config,
    relay_manager: Arc<Mutex<RelayManager>>,
) -> Result<ValidatedOhttpKeys> {
    use payjoin::bitcoin::secp256k1::rand::prelude::SliceRandom;
    let payjoin_directory = config.v2()?.pj_directory.clone();
    let relays = config.v2()?.ohttp_relays.clone();

    loop {
        let failed_relays =
            relay_manager.lock().expect("Lock should not be poisoned").get_failed_relays();

        let remaining_relays: Vec<_> =
            relays.iter().filter(|r| !failed_relays.contains(r)).cloned().collect();

        if remaining_relays.is_empty() {
            return Err(anyhow!("No valid relays available"));
        }

        let selected_relay =
            match remaining_relays.choose(&mut payjoin::bitcoin::key::rand::thread_rng()) {
                Some(relay) => relay.clone(),
                None => return Err(anyhow!("Failed to select from remaining relays")),
            };

        relay_manager
            .lock()
            .expect("Lock should not be poisoned")
            .set_selected_relay(selected_relay.clone());

        let ohttp_keys = {
            #[cfg(feature = "_danger-local-https")]
            {
                let cert_der = crate::app::read_local_cert()?;
                payjoin::io::fetch_ohttp_keys_with_cert(
                    selected_relay.clone(),
                    payjoin_directory.clone(),
                    cert_der,
                )
                .await
            }
            #[cfg(not(feature = "_danger-local-https"))]
            {
                payjoin::io::fetch_ohttp_keys(selected_relay.clone(), payjoin_directory.clone())
                    .await
            }
        };

        match ohttp_keys {
            Ok(keys) =>
                return Ok(ValidatedOhttpKeys { ohttp_keys: keys, relay_url: selected_relay }),
            Err(payjoin::io::Error::UnexpectedStatusCode(e)) => {
                return Err(payjoin::io::Error::UnexpectedStatusCode(e).into());
            }
            Err(e) => {
                log::debug!("Failed to connect to relay: {selected_relay}, {e:?}");
                relay_manager
                    .lock()
                    .expect("Lock should not be poisoned")
                    .add_failed_relay(selected_relay);
            }
        }
    }
}

1	use std::sync::{Arc, Mutex};
2
3	use anyhow::{anyhow, Result};
4
5	use super::Config;
6
7	#[derive(Debug, Clone)]
8	pub struct RelayManager {
9	selected_relay: Option<payjoin::Url>,
10	failed_relays: Vec<payjoin::Url>,
11	}
12
13	impl RelayManager {
14	pub fn new() -> Self { RelayManager { selected_relay: None, failed_relays: Vec::new() } }	4✔
15
16	pub fn set_selected_relay(&mut self, relay: payjoin::Url) { self.selected_relay = Some(relay); }	4✔
17
18	pub fn get_selected_relay(&self) -> Option<payjoin::Url> { self.selected_relay.clone() }	6✔
19
UNCOV 20	pub fn add_failed_relay(&mut self, relay: payjoin::Url) { self.failed_relays.push(relay); }	×
21
22	pub fn get_failed_relays(&self) -> Vec<payjoin::Url> { self.failed_relays.clone() }	4✔
23	}
24
25	pub(crate) struct ValidatedOhttpKeys {
26	pub(crate) ohttp_keys: payjoin::OhttpKeys,
27	pub(crate) relay_url: payjoin::Url,
28	}
29
30	pub(crate) async fn unwrap_ohttp_keys_or_else_fetch(	4✔
31	config: &Config,	4✔
32	relay_state: Arc<Mutex<RelayManager>>,	4✔
33	) -> Result<ValidatedOhttpKeys> {	4✔
34	let config_keys = config.v2()?.ohttp_keys.clone();	4✔
35	let mut fetched_keys = fetch_ohttp_keys(config, relay_state).await?;	4✔
36
37	if let Some(keys) = config_keys {	4✔
38	fetched_keys.ohttp_keys = keys;	1✔
39	}	3✔
40
41	Ok(fetched_keys)	4✔
42	}	4✔
43
44	async fn fetch_ohttp_keys(	4✔
45	config: &Config,	4✔
46	relay_manager: Arc<Mutex<RelayManager>>,	4✔
47	) -> Result<ValidatedOhttpKeys> {	4✔
48	use payjoin::bitcoin::secp256k1::rand::prelude::SliceRandom;
49	let payjoin_directory = config.v2()?.pj_directory.clone();	4✔
50	let relays = config.v2()?.ohttp_relays.clone();	4✔
51
52	loop {	4✔
53	let failed_relays =	4✔
54	relay_manager.lock().expect("Lock should not be poisoned").get_failed_relays();	4✔
55		4✔
56	let remaining_relays: Vec<_> =	4✔
57	relays.iter().filter(\|r\| !failed_relays.contains(r)).cloned().collect();	4✔
58		4✔
59	if remaining_relays.is_empty() {	4✔
UNCOV 60	return Err(anyhow!("No valid relays available"));	×
61	}	4✔
62
63	let selected_relay =	4✔
64	match remaining_relays.choose(&mut payjoin::bitcoin::key::rand::thread_rng()) {	4✔
65	Some(relay) => relay.clone(),	4✔
UNCOV 66	None => return Err(anyhow!("Failed to select from remaining relays")),	×
67	};
68
69	relay_manager	4✔
70	.lock()	4✔
71	.expect("Lock should not be poisoned")	4✔
72	.set_selected_relay(selected_relay.clone());	4✔
73
74	let ohttp_keys = {	4✔
75	#[cfg(feature = "_danger-local-https")]
76	{
77	let cert_der = crate::app::read_local_cert()?;	4✔
78	payjoin::io::fetch_ohttp_keys_with_cert(	4✔
79	selected_relay.clone(),	4✔
80	payjoin_directory.clone(),	4✔
81	cert_der,	4✔
82	)	4✔
83	.await	4✔
84	}
85	#[cfg(not(feature = "_danger-local-https"))]
86	{
87	payjoin::io::fetch_ohttp_keys(selected_relay.clone(), payjoin_directory.clone())
88	.await
89	}
90	};
91
UNCOV 92	match ohttp_keys {	×
93	Ok(keys) =>	4✔
94	return Ok(ValidatedOhttpKeys { ohttp_keys: keys, relay_url: selected_relay }),	4✔
UNCOV 95	Err(payjoin::io::Error::UnexpectedStatusCode(e)) => {	×
UNCOV 96	return Err(payjoin::io::Error::UnexpectedStatusCode(e).into());	×
97	}
UNCOV 98	Err(e) => {	×
UNCOV 99	log::debug!("Failed to connect to relay: {selected_relay}, {e:?}");	×
UNCOV 100	relay_manager	×
UNCOV 101	.lock()	×
UNCOV 102	.expect("Lock should not be poisoned")	×
UNCOV 103	.add_failed_relay(selected_relay);	×
104	}
105	}
106	}
107	}	4✔

payjoin / rust-payjoin / 15449745260

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous