Dedupe ImplementationError

Author: shinghim

payjoin-cli/src/app/v2.rs

@@ -1,11 +1,12 @@
 use std::sync::Arc;
 
 use anyhow::{anyhow, Context, Result};
+use payjoin::ImplementationError;
 use payjoin::bitcoin::consensus::encode::serialize_hex;
 use payjoin::bitcoin::psbt::Psbt;
 use payjoin::bitcoin::{Amount, FeeRate};
 use payjoin::receive::v2::{NewReceiver, Receiver, UncheckedProposal};
-use payjoin::receive::{Error, ImplementationError, ReplyableError};
+use payjoin::receive::{Error, ReplyableError};
 use payjoin::send::v2::{Sender, SenderBuilder};
 use payjoin::Uri;
 use tokio::sync::watch;

payjoin/src/core/error.rs

@@ -0,0 +1,3 @@
+use std::error;
+
+pub type ImplementationError = Box<dyn error::Error + Send + Sync>;

payjoin/src/core/mod.rs

@@ -0,0 +1,4 @@
+//! Core Payjoin
+//!
+//! This module contains types and methods used to implement Payjoin.
+pub mod error;

payjoin/src/lib.rs

@@ -69,4 +69,8 @@ pub use uri::{PjParseError, PjUri, Uri, UriExt};
 #[cfg(feature = "_core")]
 pub use url::{ParseError, Url};
 #[cfg(feature = "_core")]
+pub mod core;
+#[cfg(feature = "_core")]
 pub(crate) mod error_codes;
+#[cfg(feature = "_core")]
+pub use core::error::ImplementationError;

payjoin/src/receive/error.rs

@@ -4,8 +4,6 @@ use crate::error_codes::ErrorCode::{
     self, NotEnoughMoney, OriginalPsbtRejected, Unavailable, VersionUnsupported,
 };
 
-pub type ImplementationError = Box<dyn error::Error + Send + Sync>;
-
 /// The top-level error type for the payjoin receiver
 #[derive(Debug)]
 #[non_exhaustive]
@@ -60,7 +58,7 @@ pub enum ReplyableError {
     /// Error arising due to the specific receiver implementation
     ///
     /// e.g. database errors, network failures, wallet errors
-    Implementation(ImplementationError),
+    Implementation(crate::core::error::ImplementationError),
 }
 
 /// The standard format for errors that can be replied as JSON.

payjoin/src/receive/mod.rs

@@ -14,8 +14,8 @@ use std::str::FromStr;
 use bitcoin::{psbt, AddressType, Psbt, TxIn, TxOut};
 pub(crate) use error::InternalPayloadError;
 pub use error::{
-    Error, ImplementationError, InputContributionError, JsonReply, OutputSubstitutionError,
-    PayloadError, ReplyableError, SelectionError,
+    Error, InputContributionError, JsonReply, OutputSubstitutionError, PayloadError,
+    ReplyableError, SelectionError,
 };
 use optional_parameters::Params;
 

payjoin/src/receive/v1/mod.rs

@@ -36,12 +36,11 @@ use super::error::{
     InternalSelectionError,
 };
 use super::optional_parameters::Params;
-use super::{
-    ImplementationError, InputPair, OutputSubstitutionError, ReplyableError, SelectionError,
-};
+use super::{InputPair, OutputSubstitutionError, ReplyableError, SelectionError};
 use crate::output_substitution::OutputSubstitution;
 use crate::psbt::PsbtExt;
 use crate::receive::InternalPayloadError;
+use crate::ImplementationError;
 
 #[cfg(feature = "v1")]
 mod exclusive;

payjoin/src/receive/v2/mod.rs

@@ -14,16 +14,15 @@ use url::Url;
 
 use super::error::{Error, InputContributionError};
 use super::{
-    v1, ImplementationError, InternalPayloadError, JsonReply, OutputSubstitutionError,
-    ReplyableError, SelectionError,
+    v1, InternalPayloadError, JsonReply, OutputSubstitutionError, ReplyableError, SelectionError,
 };
 use crate::hpke::{decrypt_message_a, encrypt_message_b, HpkeKeyPair, HpkePublicKey};
 use crate::ohttp::{ohttp_decapsulate, ohttp_encapsulate, OhttpEncapsulationError, OhttpKeys};
 use crate::output_substitution::OutputSubstitution;
 use crate::persist::Persister;
 use crate::receive::{parse_payload, InputPair};
 use crate::uri::ShortId;
-use crate::{IntoUrl, IntoUrlError, Request};
+use crate::{IntoUrl, IntoUrlError, ImplementationError, Request};
 
 mod error;
 mod persist;

payjoin/src/send/v2/error.rs

@@ -2,7 +2,6 @@ use core::fmt;
 
 use crate::uri::url_ext::ParseReceiverPubkeyParamError;
 
-pub type ImplementationError = Box<dyn std::error::Error + Send + Sync>;
 /// Error returned when request could not be created.
 ///
 /// This error can currently only happen due to programmer mistake.

payjoin/src/send/v2/mod.rs

@@ -22,7 +22,7 @@
 //! wallet and http client.
 
 use bitcoin::hashes::{sha256, Hash};
-pub use error::{CreateRequestError, EncapsulationError, ImplementationError};
+pub use error::{CreateRequestError, EncapsulationError};
 use error::{InternalCreateRequestError, InternalEncapsulationError};
 use ohttp::ClientResponse;
 pub use persist::SenderToken;
@@ -31,6 +31,7 @@ use url::Url;
 
 use super::error::BuildSenderError;
 use super::*;
+use crate::core::error::ImplementationError;
 use crate::hpke::{decrypt_message_b, encrypt_message_a, HpkeSecretKey};
 use crate::ohttp::{ohttp_decapsulate, ohttp_encapsulate};
 use crate::persist::Persister;