restore previous serde usage in payjoin

Author: 0xZaddyy

payjoin/src/core/receive/error.rs

@@ -77,8 +77,7 @@ pub enum ProtocolError {
 ///     "message": "Human readable error message"
 /// }
 /// ```
-#[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct JsonReply {
     /// The error code
     error_code: ErrorCode,

payjoin/src/core/receive/v2/mod.rs

@@ -24,6 +24,7 @@
 //! Note: Even fresh requests may be linkable via metadata (e.g. client IP, request timing),
 //! but request reuse makes correlation trivial for the relay.
 
+use std::str::FromStr;
 #[cfg(not(target_arch = "wasm32"))]
 use std::time::Duration;
 
@@ -32,6 +33,8 @@ use bitcoin::psbt::Psbt;
 use bitcoin::{Address, Amount, FeeRate, OutPoint, Script, TxOut, Txid};
 pub(crate) use error::InternalSessionError;
 pub use error::SessionError;
+use serde::de::Deserializer;
+use serde::{Deserialize, Serialize};
 pub use session::{replay_event_log, SessionEvent, SessionHistory, SessionOutcome, SessionStatus};
 use url::Url;
 #[cfg(target_arch = "wasm32")]
@@ -63,10 +66,9 @@ const SUPPORTED_VERSIONS: &[Version] = &[Version::One, Version::Two];
 
 static TWENTY_FOUR_HOURS_DEFAULT_EXPIRATION: Duration = Duration::from_secs(60 * 60 * 24);
 
-#[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct SessionContext {
-    #[cfg_attr(feature = "serde", serde(deserialize_with = "deserialize_address_assume_checked"))]
+    #[serde(deserialize_with = "deserialize_address_assume_checked")]
     address: Address,
     directory: url::Url,
     ohttp_keys: OhttpKeys,
@@ -108,14 +110,10 @@ impl SessionContext {
     }
 }
 
-#[cfg(feature = "serde")]
 fn deserialize_address_assume_checked<'de, D>(deserializer: D) -> Result<Address, D::Error>
 where
-    D: serde::de::Deserializer<'de>,
+    D: Deserializer<'de>,
 {
-    use std::str::FromStr;
-
-    use serde::Deserialize;
     let s = String::deserialize(deserializer)?;
     let address = Address::from_str(&s).map_err(serde::de::Error::custom)?;
     Ok(address.assume_checked())
@@ -267,7 +265,7 @@ pub trait State: sealed::State {}
 /// various functions to accomplish the goals of the typestate, and one or more functions which
 /// will commit the changes/checks in the current typestate and move to the next one. For more
 /// information on the typestate pattern, see [The Typestate Pattern in Rust](https://cliffle.com/blog/rust-typestate/).
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Receiver<State> {
     /// Data associated with the current state of the receiver.
     pub(crate) state: State,
@@ -344,7 +342,7 @@ impl ReceiverBuilder {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Initialized {}
 
 impl Receiver<Initialized> {
@@ -1216,7 +1214,7 @@ impl Receiver<HasReplyableError> {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Monitor {
     psbt_context: PsbtContext,
 }

payjoin/src/core/receive/v2/session.rs

@@ -1,3 +1,5 @@
+use serde::{Deserialize, Serialize};
+
 use super::{ReceiveSession, SessionContext};
 use crate::error::{InternalReplayError, ReplayError};
 use crate::output_substitution::OutputSubstitution;
@@ -140,8 +142,7 @@ pub enum SessionStatus {
 
 /// Represents a piece of information that the receiver has obtained from the session
 /// Each event can be used to transition the receiver state machine to a new state
-#[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 pub enum SessionEvent {
     Created(SessionContext),
     RetrievedOriginalPayload { original: OriginalPayload, reply_key: Option<crate::HpkePublicKey> },
@@ -159,8 +160,7 @@ pub enum SessionEvent {
 }
 
 /// Represents all possible outcomes for a closed Payjoin session
-#[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Debug, Clone, Serialize, Deserialize,  PartialEq, Eq)]
 pub enum SessionOutcome {
     /// Payjoin completed successfully
     Success(Vec<(bitcoin::ScriptBuf, bitcoin::Witness)>),

payjoin/src/core/send/v2/mod.rs

@@ -33,6 +33,7 @@ use bitcoin::Address;
 pub use error::{CreateRequestError, EncapsulationError};
 use error::{InternalCreateRequestError, InternalEncapsulationError};
 use ohttp::ClientResponse;
+use serde::{Deserialize, Serialize};
 pub use session::{replay_event_log, SessionEvent, SessionHistory, SessionOutcome, SessionStatus};
 use url::Url;
 
@@ -189,14 +190,13 @@ mod sealed {
 /// can implement this trait, ensuring type safety and protocol integrity.
 pub trait State: sealed::State {}
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Sender<State> {
     pub(crate) state: State,
     pub(crate) session_context: SessionContext,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct SessionContext {
     /// The endpoint in the Payjoin URI
     pub(crate) pj_param: PjParam,
@@ -278,7 +278,7 @@ impl SendSession {
 
 /// A payjoin V2 sender, allowing the construction of a payjoin V2 request
 /// and the resulting [`ClientResponse`].
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct WithReplyKey;
 
 impl Sender<WithReplyKey> {
@@ -412,7 +412,7 @@ pub(crate) fn serialize_v2_body(
 ///
 /// This type is used to make a BIP77 GET request and process the response.
 /// Call [`Sender<PollingForProposal>::process_response`] on it to continue the BIP77 flow.
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 pub struct PollingForProposal;
 
 impl ResponseError {

payjoin/src/core/send/v2/session.rs

@@ -103,8 +103,7 @@ pub enum SessionStatus {
     Completed,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub enum SessionEvent {
     /// Sender was created with session data
     Created(Box<SessionContext>),
@@ -115,8 +114,7 @@ pub enum SessionEvent {
 }
 
 /// Represents all possible outcomes for a closed Payjoin session
-#[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, PartialEq, Eq)]
 pub enum SessionOutcome {
     /// Successful payjoin
     Success(bitcoin::Psbt),