13597174622

Committed 28 Feb 2025 09:56PM UTC coverage: 79.747% (+0.4%) from 79.302%

Build # 13597174622

Build Type

Pull #434

github

Committed by

web-flow

Commit Message

Merge 2715774b0 into 8777c16f3

Pull Request Pull Request #434: Multiparty Senders: NS1R

Run Details

423 of 493 new or added lines in 9 files covered. (85.8%)

3 existing lines in 2 files now uncovered.

4544 of 5698 relevant lines covered (79.75%)

810.38 hits per line

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

0.0

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

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

#[derive(Debug)]
pub struct MultiPartyError(InternalMultiPartyError);

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

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::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::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	#[derive(Debug)]
5	pub struct MultiPartyError(InternalMultiPartyError);
6
7	#[derive(Debug)]
8	pub(crate) enum InternalMultiPartyError {
9	/// Not enough proposals
10	NotEnoughProposals,
11	/// Proposal version not supported
12	ProposalVersionNotSupported(usize),
13	/// Optimistic merge not supported
14	OptimisticMergeNotSupported,
15	/// Bitcoin Internal Error
16	BitcoinExtractTxError(bitcoin::psbt::ExtractTxError),
17	/// Input in Finalized Proposal is missing witness or script_sig
18	InputMissingWitnessOrScriptSig,
19	/// Failed to combine psbts
20	FailedToCombinePsbts(bitcoin::psbt::Error),
21	}
22
23	impl From<InternalMultiPartyError> for MultiPartyError {
NEW 24	fn from(e: InternalMultiPartyError) -> Self { MultiPartyError(e) }	×
25	}
26
27	impl fmt::Display for MultiPartyError {
NEW 28	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {	×
NEW 29	match &self.0 {	×
NEW 30	InternalMultiPartyError::NotEnoughProposals => write!(f, "Not enough proposals"),	×
NEW 31	InternalMultiPartyError::ProposalVersionNotSupported(v) =>	×
NEW 32	write!(f, "Proposal version not supported: {}", v),	×
33	InternalMultiPartyError::OptimisticMergeNotSupported =>
NEW 34	write!(f, "Optimistic merge not supported"),	×
NEW 35	InternalMultiPartyError::BitcoinExtractTxError(e) =>	×
NEW 36	write!(f, "Bitcoin extract tx error: {:?}", e),	×
37	InternalMultiPartyError::InputMissingWitnessOrScriptSig =>
NEW 38	write!(f, "Input in Finalized Proposal is missing witness or script_sig"),	×
NEW 39	InternalMultiPartyError::FailedToCombinePsbts(e) =>	×
NEW 40	write!(f, "Failed to combine psbts: {:?}", e),	×
41	}
NEW 42	}	×
43	}
44
45	impl error::Error for MultiPartyError {
NEW 46	fn source(&self) -> Option<&(dyn error::Error + 'static)> {	×
NEW 47	match &self.0 {	×
NEW 48	InternalMultiPartyError::NotEnoughProposals => None,	×
NEW 49	InternalMultiPartyError::ProposalVersionNotSupported(_) => None,	×
NEW 50	InternalMultiPartyError::OptimisticMergeNotSupported => None,	×
NEW 51	InternalMultiPartyError::BitcoinExtractTxError(e) => Some(e),	×
NEW 52	InternalMultiPartyError::InputMissingWitnessOrScriptSig => None,	×
NEW 53	InternalMultiPartyError::FailedToCombinePsbts(e) => Some(e),	×
54	}
NEW 55	}	×
56	}

payjoin / rust-payjoin / 13597174622

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