Merge pull request #30 from spacesprotocol/json-format-cleanup

Update json format for bid psbt errors

Author: buffrr

protocol/src/lib.rs

@@ -117,41 +117,47 @@ pub enum Covenant {
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 #[cfg_attr(
     feature = "serde",
-    serde(rename_all = "snake_case", tag = "revoke_reason")
+    serde(rename_all = "snake_case", tag = "reason")
 )]
 pub enum RevokeReason {
-    BidPsbt(BidPsbtReason),
     /// Space was prematurely spent during the auctions phase
     PrematureClaim,
     /// Space output was spent either by spending it directly
     /// Space was transferred without following Input N => Output N+1 rule
     BadSpend,
     Expired,
+    #[cfg_attr(feature = "serde", serde(untagged))]
+    BidPsbt(BidPsbtReason)
 }
 
 #[derive(Copy, Clone, PartialEq, Debug, Eq)]
 #[cfg_attr(
     feature = "serde",
     derive(Serialize, Deserialize),
-    serde(rename_all = "snake_case")
+    serde(rename_all = "snake_case", tag="reason")
 )]
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 pub enum RejectReason {
     AlreadyExists,
-    BidPSBT(BidPsbtReason),
+    #[cfg_attr(feature = "serde", serde(untagged))]
+    BidPsbt(BidPsbtReason),
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(
     feature = "serde",
     derive(Serialize, Deserialize),
-    serde(rename_all = "snake_case", tag = "bid_psbt_reason")
+    serde(tag = "reason")
 )]
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 pub enum BidPsbtReason {
+    #[cfg_attr(feature = "serde", serde(rename = "bid_psbt_required"))]
     Required,
+    #[cfg_attr(feature = "serde", serde(rename = "bid_psbt_low_bid_amount"))]
     LowBidAmount,
+    #[cfg_attr(feature = "serde", serde(rename = "bid_psbt_bad_signature"))]
     BadSignature,
+    #[cfg_attr(feature = "serde", serde(rename = "bid_psbt_output_spent"))]
     OutputSpent,
 }
 

protocol/src/validate.rs

@@ -82,6 +82,8 @@ pub struct RevokeParams {
 pub struct RejectParams {
     #[cfg_attr(feature = "bincode", bincode(with_serde))]
     pub name: SName,
+
+    #[cfg_attr(feature = "serde", serde(flatten))]
     pub reason: RejectReason,
 }
 
@@ -338,7 +340,7 @@ impl Validator {
             None => {
                 let reject = ScriptError::Reject(RejectParams {
                     name,
-                    reason: RejectReason::BidPSBT(BidPsbtReason::Required),
+                    reason: RejectReason::BidPsbt(BidPsbtReason::Required),
                 });
 
                 changeset.spends[spend_index].script_error = Some(reject);
@@ -350,7 +352,7 @@ impl Validator {
         if auctiond.output.is_none() {
             let reject = ScriptError::Reject(RejectParams {
                 name,
-                reason: RejectReason::BidPSBT(BidPsbtReason::OutputSpent),
+                reason: RejectReason::BidPsbt(BidPsbtReason::OutputSpent),
             });
             changeset.spends[spend_index].script_error = Some(reject);
             return;
@@ -379,7 +381,7 @@ impl Validator {
         if !fullspaceout.verify_bid_sig() {
             let reject = ScriptError::Reject(RejectParams {
                 name: fullspaceout.spaceout.space.unwrap().name,
-                reason: RejectReason::BidPSBT(BidPsbtReason::BadSignature),
+                reason: RejectReason::BidPsbt(BidPsbtReason::BadSignature),
             });
             changeset.spends[spend_index].script_error = Some(reject);
             return;