DRY up JsonReply for legibility

Author: DanGould

payjoin/src/receive/error.rs

@@ -201,26 +201,29 @@ impl From<&PayloadError> for JsonReply {
         use InternalPayloadError::*;
 
         match &e.0 {
-            Utf8(_) => JsonReply::new(OriginalPsbtRejected, e),
-            ParsePsbt(_) => JsonReply::new(OriginalPsbtRejected, e),
+            Utf8(_)
+            | ParsePsbt(_)
+            | InconsistentPsbt(_)
+            | PrevTxOut(_)
+            | MissingPayment
+            | OriginalPsbtNotBroadcastable
+            | InputOwned(_)
+            | InputWeight(_)
+            | InputSeen(_)
+            | PsbtBelowFeeRate(_, _) => JsonReply::new(OriginalPsbtRejected, e),
+
+            FeeTooHigh(_, _) => JsonReply::new(NotEnoughMoney, e),
+
             SenderParams(e) => match e {
                 super::optional_parameters::Error::UnknownVersion { supported_versions } => {
                     let supported_versions_json =
                         serde_json::to_string(supported_versions).unwrap_or_default();
                     JsonReply::new(VersionUnsupported, "This version of payjoin is not supported.")
                         .with_extra("supported", supported_versions_json)
                 }
-                _ => JsonReply::new(OriginalPsbtRejected, e),
+                super::optional_parameters::Error::FeeRate =>
+                    JsonReply::new(OriginalPsbtRejected, e),
             },
-            InconsistentPsbt(_) => JsonReply::new(OriginalPsbtRejected, e),
-            PrevTxOut(_) => JsonReply::new(OriginalPsbtRejected, e),
-            MissingPayment => JsonReply::new(OriginalPsbtRejected, e),
-            OriginalPsbtNotBroadcastable => JsonReply::new(OriginalPsbtRejected, e),
-            InputOwned(_) => JsonReply::new(OriginalPsbtRejected, e),
-            InputWeight(_) => JsonReply::new(OriginalPsbtRejected, e),
-            InputSeen(_) => JsonReply::new(OriginalPsbtRejected, e),
-            PsbtBelowFeeRate(_, _) => JsonReply::new(OriginalPsbtRejected, e),
-            FeeTooHigh(_, _) => JsonReply::new(NotEnoughMoney, e),
         }
     }
 }

payjoin/src/receive/v1/exclusive/error.rs

@@ -42,13 +42,13 @@ impl From<&RequestError> for JsonReply {
     fn from(e: &RequestError) -> Self {
         use InternalRequestError::*;
 
-        use crate::error_codes::ErrorCode::OriginalPsbtRejected;
         match &e.0 {
-            Io(_) => JsonReply::new(OriginalPsbtRejected, e),
-            MissingHeader(_) => JsonReply::new(OriginalPsbtRejected, e),
-            InvalidContentType(_) => JsonReply::new(OriginalPsbtRejected, e),
-            InvalidContentLength(_) => JsonReply::new(OriginalPsbtRejected, e),
-            ContentLengthTooLarge(_) => JsonReply::new(OriginalPsbtRejected, e),
+            Io(_)
+            | MissingHeader(_)
+            | InvalidContentType(_)
+            | InvalidContentLength(_)
+            | ContentLengthTooLarge(_) =>
+                JsonReply::new(crate::error_codes::ErrorCode::OriginalPsbtRejected, e),
         }
     }
 }