Skip serializing None in batch::File (#3943)

ordinals · Sep 14, 2024 · c5f4ab5 · c5f4ab5
1 parent ed19df5
commit c5f4ab5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/src/subcommand/decode.rs b/src/subcommand/decode.rs
@@ -12,8 +12,8 @@ pub struct RawOutput {
   pub runestone: Option<Artifact>,
 }
 
-#[derive(Serialize, Eq, PartialEq, Deserialize, Debug)]
 #[serde_with::skip_serializing_none]
+#[derive(Serialize, Eq, PartialEq, Deserialize, Debug)]
 pub struct CompactInscription {
   pub body: Option<String>,
   pub content_encoding: Option<String>,

diff --git a/src/wallet/batch/entry.rs b/src/wallet/batch/entry.rs
@@ -1,14 +1,15 @@
 use super::*;
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Deserialize, Default, PartialEq, Debug, Clone)]
 #[serde(deny_unknown_fields)]
 pub struct Entry {
+  pub file: Option<PathBuf>,
   pub delegate: Option<InscriptionId>,
+  pub satpoint: Option<SatPoint>,
   pub destination: Option<Address<NetworkUnchecked>>,
-  pub file: Option<PathBuf>,
   pub metadata: Option<serde_yaml::Value>,
   pub metaprotocol: Option<String>,
-  pub satpoint: Option<SatPoint>,
 }
 
 impl Entry {

diff --git a/src/wallet/batch/etching.rs b/src/wallet/batch/etching.rs
@@ -1,13 +1,14 @@
 use super::*;
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Deserialize, PartialEq, Debug, Copy, Clone, Default)]
 #[serde(deny_unknown_fields)]
 pub struct Etching {
-  pub divisibility: u8,
-  pub premine: Decimal,
   pub rune: SpacedRune,
-  pub supply: Decimal,
   pub symbol: char,
+  pub divisibility: u8,
+  pub supply: Decimal,
+  pub premine: Decimal,
   pub terms: Option<batch::Terms>,
   pub turbo: bool,
 }
diff --git a/src/wallet/batch/file.rs b/src/wallet/batch/file.rs
@@ -1,17 +1,18 @@
 use super::*;
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Deserialize, PartialEq, Debug, Clone, Default)]
 #[serde(deny_unknown_fields)]
 pub struct File {
-  pub inscriptions: Vec<Entry>,
   pub mode: Mode,
   pub parent: Option<InscriptionId>,
   pub postage: Option<u64>,
   #[serde(default)]
   pub reinscribe: bool,
-  pub etching: Option<batch::Etching>,
   pub sat: Option<Sat>,
   pub satpoint: Option<SatPoint>,
+  pub inscriptions: Vec<batch::entry::Entry>,
+  pub etching: Option<batch::Etching>,
 }
 
 impl File {

diff --git a/src/wallet/batch/terms.rs b/src/wallet/batch/terms.rs
@@ -1,5 +1,6 @@
 use super::*;
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Deserialize, PartialEq, Debug, Copy, Clone, Default)]
 #[serde(deny_unknown_fields)]
 pub struct Terms {