15323824025

Committed 29 May 2025 12:27PM UTC coverage: 84.292% (-0.3%) from 84.553%

Build # 15323824025

Build Type

Pull #703

github

Committed by

web-flow

Commit Message

Merge 5537853fe into 16f0c20fa

Pull Request Pull Request #703: Refactor config to use derive macros over builder

Run Details

116 of 130 new or added lines in 3 files covered. (89.23%)

1 existing line in 1 file now uncovered.

6402 of 7595 relevant lines covered (84.29%)

609.76 hits per line

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

96.72

/payjoin-cli/src/main.rs

use anyhow::Result;
use app::config::Config;
use app::App as AppTrait;
use clap::Parser;
use cli::{Cli, Commands};
use payjoin::bitcoin::FeeRate;

mod app;
mod cli;
mod db;

#[cfg(not(any(feature = "v1", feature = "v2")))]
compile_error!("At least one of the features ['v1', 'v2'] must be enabled");

#[tokio::main]
async fn main() -> Result<()> {
    env_logger::init();

    let cli = Cli::parse();
    let config = Config::new(&cli)?;

    #[allow(clippy::if_same_then_else)]
    let app: Box<dyn AppTrait> = if cli.flags.bip78.unwrap_or(false) {
        #[cfg(feature = "v1")]
        {
            Box::new(crate::app::v1::App::new(config)?)
        }
        #[cfg(not(feature = "v1"))]
        {
            anyhow::bail!(
                "BIP78 (v1) support is not enabled in this build. Recompile with --features v1"
            )
        }
    } else if cli.flags.bip77.unwrap_or(false) {
        #[cfg(feature = "v2")]
        {
            Box::new(crate::app::v2::App::new(config)?)
        }
        #[cfg(not(feature = "v2"))]
        {
            anyhow::bail!(
                "BIP77 (v2) support is not enabled in this build. Recompile with --features v2"
            )
        }
    } else {
        #[cfg(feature = "v2")]
        {
            Box::new(crate::app::v2::App::new(config)?)
        }
        #[cfg(all(feature = "v1", not(feature = "v2")))]
        {
            Box::new(crate::app::v1::App::new(config)?)
        }
        #[cfg(not(any(feature = "v1", feature = "v2")))]
        {
            anyhow::bail!("No valid version available - must compile with v1 or v2 feature")
        }
    };

    match &cli.command {
        Commands::Send { bip21, fee_rate } => {
            let fee = fee_rate
                .unwrap_or_else(|| FeeRate::from_sat_per_vb(2).unwrap_or(FeeRate::BROADCAST_MIN));
            app.send_payjoin(bip21, fee).await?;
        }
        Commands::Receive { amount, .. } => {
            app.receive_payjoin(*amount).await?;
        }
        #[cfg(feature = "v2")]
        Commands::Resume => {
            app.resume_payjoins().await?;
        }
    };

    Ok(())
}

1	use anyhow::Result;
2	use app::config::Config;
3	use app::App as AppTrait;
4	use clap::Parser;
5	use cli::{Cli, Commands};
6	use payjoin::bitcoin::FeeRate;
7
8	mod app;
9	mod cli;
10	mod db;
11
12	#[cfg(not(any(feature = "v1", feature = "v2")))]
13	compile_error!("At least one of the features ['v1', 'v2'] must be enabled");
14
15	#[tokio::main]
16	async fn main() -> Result<()> {	8✔
17	env_logger::init();	8✔
18		8✔
19	let cli = Cli::parse();	8✔
20	let config = Config::new(&cli)?;	8✔
21		8✔
22	#[allow(clippy::if_same_then_else)]	8✔
23	let app: Box<dyn AppTrait> = if cli.flags.bip78.unwrap_or(false) {	8✔
24	#[cfg(feature = "v1")]	8✔
25	{	8✔
26	Box::new(crate::app::v1::App::new(config)?)	8✔
27	}	8✔
28	#[cfg(not(feature = "v1"))]	8✔
29	{	8✔
30	anyhow::bail!(	8✔
31	"BIP78 (v1) support is not enabled in this build. Recompile with --features v1"	8✔
32	)	8✔
33	}	8✔
34	} else if cli.flags.bip77.unwrap_or(false) {	8✔
35	#[cfg(feature = "v2")]	8✔
36	{	8✔
37	Box::new(crate::app::v2::App::new(config)?)	8✔
38	}	8✔
39	#[cfg(not(feature = "v2"))]	8✔
40	{	8✔
41	anyhow::bail!(	8✔
42	"BIP77 (v2) support is not enabled in this build. Recompile with --features v2"	×
UNCOV 43	)	×
44	}	8✔
45	} else {	8✔
46	#[cfg(feature = "v2")]	8✔
47	{	8✔
48	Box::new(crate::app::v2::App::new(config)?)	8✔
49	}	8✔
50	#[cfg(all(feature = "v1", not(feature = "v2")))]	8✔
51	{	8✔
52	Box::new(crate::app::v1::App::new(config)?)	8✔
53	}	8✔
54	#[cfg(not(any(feature = "v1", feature = "v2")))]	8✔
55	{	8✔
56	anyhow::bail!("No valid version available - must compile with v1 or v2 feature")	8✔
57	}	8✔
58	};	8✔
59		8✔
60	match &cli.command {	8✔
61	Commands::Send { bip21, fee_rate } => {	8✔
62	let fee = fee_rate	4✔
63	.unwrap_or_else(\|\| FeeRate::from_sat_per_vb(2).unwrap_or(FeeRate::BROADCAST_MIN));	4✔
64	app.send_payjoin(bip21, fee).await?;	4✔
65	}	8✔
66	Commands::Receive { amount, .. } => {	8✔
67	app.receive_payjoin(*amount).await?;	3✔
68	}	8✔
69	#[cfg(feature = "v2")]	8✔
70	Commands::Resume => {	8✔
71	app.resume_payjoins().await?;	8✔
72	}	8✔
73	};	8✔
74		8✔
75	Ok(())	8✔
76	}	8✔

payjoin / rust-payjoin / 15323824025

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