14622295854

Committed 23 Apr 2025 03:39PM UTC coverage: 81.936% (+0.1%) from 81.835%

Build # 14622295854

Build Type

Pull #642

github

Committed by

web-flow

Commit Message

Merge 88591af64 into 3b23dcaf5

Pull Request Pull Request #642: Duplicate proposals catch in ns1r

Coverage Stats

119 of 139 new or added lines in 3 files covered. (85.61%)

2 existing lines in 1 file now uncovered.

5434 of 6632 relevant lines covered (81.94%)

697.35 hits per line

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

53.85

/payjoin/src/receive/multiparty/error.rs

use core::fmt;
use std::error;

use crate::receive::v2::{self};

#[derive(Debug)]
pub struct MultipartyError(InternalMultipartyError);

#[derive(Debug)]
pub(crate) enum InternalMultipartyError {
    /// Not enough proposals
    NotEnoughProposals,
    /// Duplicate proposals
    IdenticalProposals(IdenticalProposalError),
    /// Proposal version not supported
    ProposalVersionNotSupported(usize),
    /// Optimistic merge not supported
    OptimisticMergeNotSupported,
    /// Bitcoin Internal Error
    BitcoinExtractTxError(Box<bitcoin::psbt::ExtractTxError>),
    /// Input in Finalized Proposal is missing witness or script_sig
    InputMissingWitnessOrScriptSig,
    /// Failed to combine psbts
    FailedToCombinePsbts(bitcoin::psbt::Error),
}

#[derive(Debug)]
pub enum IdenticalProposalError {
    IdenticalPsbts(Box<bitcoin::Psbt>, Box<bitcoin::Psbt>),
    IdenticalContexts(Box<v2::UncheckedProposal>, Box<v2::UncheckedProposal>),
}

impl std::fmt::Display for IdenticalProposalError {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        match self {
            IdenticalProposalError::IdenticalPsbts(current_psbt, incoming_psbt) => write!(
                f,
                "Two sender psbts are identical\n left psbt: {}\n right psbt: {}",
                current_psbt, incoming_psbt
            ),
            IdenticalProposalError::IdenticalContexts(current_context, incoming_context) => write!(
                f,
                "Two sender contexts are identical\n left id: {}\n right id: {}",
                current_context.id(),
                incoming_context.id()
            ),
        }
    }
}

impl From<InternalMultipartyError> for MultipartyError {
    fn from(e: InternalMultipartyError) -> Self { MultipartyError(e) }
}

impl fmt::Display for MultipartyError {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
        match &self.0 {
            InternalMultipartyError::NotEnoughProposals => write!(f, "Not enough proposals"),
            InternalMultipartyError::IdenticalProposals(e) =>
                write!(f, "More than one identical participant: {}", e),
            InternalMultipartyError::ProposalVersionNotSupported(v) =>
                write!(f, "Proposal version not supported: {}", v),
            InternalMultipartyError::OptimisticMergeNotSupported =>
                write!(f, "Optimistic merge not supported"),
            InternalMultipartyError::BitcoinExtractTxError(e) =>
                write!(f, "Bitcoin extract tx error: {:?}", e),
            InternalMultipartyError::InputMissingWitnessOrScriptSig =>
                write!(f, "Input in Finalized Proposal is missing witness or script_sig"),
            InternalMultipartyError::FailedToCombinePsbts(e) =>
                write!(f, "Failed to combine psbts: {:?}", e),
        }
    }
}

impl error::Error for MultipartyError {
    fn source(&self) -> Option<&(dyn error::Error + 'static)> {
        match &self.0 {
            InternalMultipartyError::NotEnoughProposals => None,
            InternalMultipartyError::IdenticalProposals(_) => None,
            InternalMultipartyError::ProposalVersionNotSupported(_) => None,
            InternalMultipartyError::OptimisticMergeNotSupported => None,
            InternalMultipartyError::BitcoinExtractTxError(e) => Some(e),
            InternalMultipartyError::InputMissingWitnessOrScriptSig => None,
            InternalMultipartyError::FailedToCombinePsbts(e) => Some(e),
        }
    }
}

1	use core::fmt;
2	use std::error;
3
4	use crate::receive::v2::{self};
5
6	#[derive(Debug)]
7	pub struct MultipartyError(InternalMultipartyError);
8
9	#[derive(Debug)]
10	pub(crate) enum InternalMultipartyError {
11	/// Not enough proposals
12	NotEnoughProposals,
13	/// Duplicate proposals
14	IdenticalProposals(IdenticalProposalError),
15	/// Proposal version not supported
16	ProposalVersionNotSupported(usize),
17	/// Optimistic merge not supported
18	OptimisticMergeNotSupported,
19	/// Bitcoin Internal Error
20	BitcoinExtractTxError(Box<bitcoin::psbt::ExtractTxError>),
21	/// Input in Finalized Proposal is missing witness or script_sig
22	InputMissingWitnessOrScriptSig,
23	/// Failed to combine psbts
24	FailedToCombinePsbts(bitcoin::psbt::Error),
25	}
26
27	#[derive(Debug)]
28	pub enum IdenticalProposalError {
29	IdenticalPsbts(Box<bitcoin::Psbt>, Box<bitcoin::Psbt>),
30	IdenticalContexts(Box<v2::UncheckedProposal>, Box<v2::UncheckedProposal>),
31	}
32
33	impl std::fmt::Display for IdenticalProposalError {
34	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {	4✔
35	match self {	4✔
36	IdenticalProposalError::IdenticalPsbts(current_psbt, incoming_psbt) => write!(	2✔
37	f,	2✔
38	"Two sender psbts are identical\n left psbt: {}\n right psbt: {}",	2✔
39	current_psbt, incoming_psbt	2✔
40	),	2✔
41	IdenticalProposalError::IdenticalContexts(current_context, incoming_context) => write!(	2✔
42	f,	2✔
43	"Two sender contexts are identical\n left id: {}\n right id: {}",	2✔
44	current_context.id(),	2✔
45	incoming_context.id()	2✔
46	),	2✔
47	}
48	}	4✔
49	}
50
51	impl From<InternalMultipartyError> for MultipartyError {
52	fn from(e: InternalMultipartyError) -> Self { MultipartyError(e) }	6✔
53	}
54
55	impl fmt::Display for MultipartyError {
56	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {	6✔
57	match &self.0 {	6✔
58	InternalMultipartyError::NotEnoughProposals => write!(f, "Not enough proposals"),	2✔
59	InternalMultipartyError::IdenticalProposals(e) =>	4✔
60	write!(f, "More than one identical participant: {}", e),	4✔
61	InternalMultipartyError::ProposalVersionNotSupported(v) =>	×
62	write!(f, "Proposal version not supported: {}", v),	×
63	InternalMultipartyError::OptimisticMergeNotSupported =>
64	write!(f, "Optimistic merge not supported"),	×
65	InternalMultipartyError::BitcoinExtractTxError(e) =>	×
66	write!(f, "Bitcoin extract tx error: {:?}", e),	×
67	InternalMultipartyError::InputMissingWitnessOrScriptSig =>
68	write!(f, "Input in Finalized Proposal is missing witness or script_sig"),	×
69	InternalMultipartyError::FailedToCombinePsbts(e) =>	×
70	write!(f, "Failed to combine psbts: {:?}", e),	×
71	}
72	}	6✔
73	}
74
75	impl error::Error for MultipartyError {
76	fn source(&self) -> Option<&(dyn error::Error + 'static)> {	×
77	match &self.0 {	×
78	InternalMultipartyError::NotEnoughProposals => None,	×
NEW 79	InternalMultipartyError::IdenticalProposals(_) => None,	×
80	InternalMultipartyError::ProposalVersionNotSupported(_) => None,	×
81	InternalMultipartyError::OptimisticMergeNotSupported => None,	×
82	InternalMultipartyError::BitcoinExtractTxError(e) => Some(e),	×
83	InternalMultipartyError::InputMissingWitnessOrScriptSig => None,	×
84	InternalMultipartyError::FailedToCombinePsbts(e) => Some(e),	×
85	}
86	}	×
87	}

payjoin / rust-payjoin / 14622295854

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