Suppress empty command output (ordinals#2995)

src/lib.rs

@@ -248,7 +248,11 @@ pub fn main() {
 
  process::exit(1);
  }
- Ok(output) => output.print_json(),
+ Ok(output) => {
+ if let Some(output) = output {
+ output.print_json();
+ }
+ }
  }
 
  gracefully_shutdown_indexer();

src/subcommand.rs

@@ -77,9 +77,6 @@ impl Subcommand {
  }
 }
 
-#[derive(Serialize, Deserialize)]
-pub struct Empty {}
-
 pub(crate) trait Output: Send {
  fn print_json(&self);
 }
@@ -94,4 +91,4 @@ where
  }
 }
 
-pub(crate) type SubcommandResult = Result<Box<dyn Output>>;
+pub(crate) type SubcommandResult = Result<Option<Box<dyn Output>>>;

src/subcommand/balances.rs

@@ -15,7 +15,7 @@ pub(crate) fn run(options: Options) -> SubcommandResult {
 
  index.update()?;
 
- Ok(Box::new(Output {
+ Ok(Some(Box::new(Output {
  runes: index.get_rune_balance_map()?,
- }))
+ })))
 }

src/subcommand/decode.rs

@@ -88,15 +88,15 @@ impl Decode {
  let inscriptions = ParsedEnvelope::from_transaction(&transaction);
 
  if self.compact {
- Ok(Box::new(CompactOutput {
+ Ok(Some(Box::new(CompactOutput {
  inscriptions: inscriptions
  .clone()
  .into_iter()
  .map(|inscription| inscription.payload.try_into())
  .collect::<Result<Vec<CompactInscription>>>()?,
- }))
+ })))
  } else {
- Ok(Box::new(RawOutput { inscriptions }))
+ Ok(Some(Box::new(RawOutput { inscriptions })))
  }
  }
 }

src/subcommand/epochs.rs

@@ -11,5 +11,5 @@ pub(crate) fn run() -> SubcommandResult {
  starting_sats.push(sat);
  }
 
- Ok(Box::new(Output { starting_sats }))
+ Ok(Some(Box::new(Output { starting_sats })))
 }

src/subcommand/find.rs

@@ -32,11 +32,11 @@ impl Find {
 
  match self.end {
  Some(end) => match index.find_range(self.sat, end)? {
- Some(result) => Ok(Box::new(result)),
+ Some(result) => Ok(Some(Box::new(result))),
  None => Err(anyhow!("range has not been mined as of index height")),
  },
  None => match index.find(self.sat)? {
- Some(satpoint) => Ok(Box::new(Output { satpoint })),
+ Some(satpoint) => Ok(Some(Box::new(Output { satpoint }))),
  None => Err(anyhow!("sat has not been mined as of index height")),
  },
  }

src/subcommand/index/export.rs

@@ -15,6 +15,6 @@ impl Export {
  index.update()?;
  index.export(&self.tsv, self.include_addresses)?;
 
- Ok(Box::new(Empty {}))
+ Ok(None)
  }
 }

src/subcommand/index/info.rs

@@ -34,9 +34,9 @@ impl Info {
  elapsed: (end.starting_timestamp - start.starting_timestamp) as f64 / 1000.0 / 60.0,
  });
  }
- Ok(Box::new(output))
+ Ok(Some(Box::new(output)))
  } else {
- Ok(Box::new(info))
+ Ok(Some(Box::new(info)))
  }
  }
 }

src/subcommand/index/update.rs

@@ -5,5 +5,5 @@ pub(crate) fn run(options: Options) -> SubcommandResult {
 
  index.update()?;
 
- Ok(Box::new(Empty {}))
+ Ok(None)
 }

src/subcommand/list.rs

@@ -51,7 +51,7 @@ impl List {
  });
  }
 
- Ok(Box::new(outputs))
+ Ok(Some(Box::new(outputs)))
  }
  Some(crate::index::List::Spent) => Err(anyhow!("output spent.")),
  None => Err(anyhow!("output not found")),

src/subcommand/parse.rs

@@ -13,8 +13,8 @@ pub struct Output {
 
 impl Parse {
  pub(crate) fn run(self) -> SubcommandResult {
- Ok(Box::new(Output {
+ Ok(Some(Box::new(Output {
  object: self.object,
- }))
+ })))
  }
 }

src/subcommand/preview.rs

@@ -200,6 +200,6 @@ impl Preview {
  .run()?;
  }
 
- Ok(Box::new(Empty {}))
+ Ok(None)
  }
 }

src/subcommand/runes.rs

@@ -35,7 +35,7 @@ pub(crate) fn run(options: Options) -> SubcommandResult {
 
  index.update()?;
 
- Ok(Box::new(Output {
+ Ok(Some(Box::new(Output {
  runes: index
  .runes()?
  .into_iter()
@@ -82,5 +82,5 @@ pub(crate) fn run(options: Options) -> SubcommandResult {
  },
  )
  .collect::<BTreeMap<Rune, RuneInfo>>(),
- }))
+ })))
 }

src/subcommand/server.rs

@@ -334,7 +334,7 @@ impl Server {
  (None, None) => unreachable!(),
  }
 
- Ok(Box::new(Empty {}) as Box<dyn Output>)
+ Ok(None)
  })
  }
 

src/subcommand/subsidy.rs

@@ -23,10 +23,10 @@ impl Subsidy {
  bail!("block {} has no subsidy", self.height);
  }
 
- Ok(Box::new(Output {
+ Ok(Some(Box::new(Output {
  first: first.0,
  subsidy,
  name: first.name(),
- }))
+ })))
  }
 }

src/subcommand/supply.rs

@@ -18,10 +18,10 @@ pub(crate) fn run() -> SubcommandResult {
  last += 1;
  }
 
- Ok(Box::new(Output {
+ Ok(Some(Box::new(Output {
  supply: Sat::SUPPLY,
  first: 0,
  last: Sat::SUPPLY - 1,
  last_mined_in_block: last,
- }))
+ })))
 }

src/subcommand/teleburn.rs

@@ -13,8 +13,8 @@ pub struct Output {
 
 impl Teleburn {
  pub(crate) fn run(self) -> SubcommandResult {
- Ok(Box::new(Output {
+ Ok(Some(Box::new(Output {
  ethereum: self.destination.into(),
- }))
+ })))
  }
 }

src/subcommand/traits.rs

@@ -22,7 +22,7 @@ pub struct Output {
 
 impl Traits {
  pub(crate) fn run(self) -> SubcommandResult {
- Ok(Box::new(Output {
+ Ok(Some(Box::new(Output {
  number: self.sat.n(),
  decimal: self.sat.decimal().to_string(),
  degree: self.sat.degree().to_string(),
@@ -33,6 +33,6 @@ impl Traits {
  period: self.sat.period(),
  offset: self.sat.third(),
  rarity: self.sat.rarity(),
- }))
+ })))
  }
 }

src/subcommand/wallet/balance.rs

@@ -45,13 +45,13 @@ pub(crate) fn run(wallet: String, options: Options) -> SubcommandResult {
  }
  }
 
- Ok(Box::new(Output {
+ Ok(Some(Box::new(Output {
  cardinal,
  ordinal,
  runes: index.has_rune_index().then_some(runes),
  runic: index.has_rune_index().then_some(runic),
  total: cardinal + ordinal + runic,
- }))
+ })))
 }
 
 #[cfg(test)]

src/subcommand/wallet/cardinals.rs

@@ -35,5 +35,5 @@ pub(crate) fn run(wallet: String, options: Options) -> SubcommandResult {
  })
  .collect::<Vec<CardinalUtxo>>();
 
- Ok(Box::new(cardinal_utxos))
+ Ok(Some(Box::new(cardinal_utxos)))
 }

src/subcommand/wallet/create.rs

@@ -25,9 +25,9 @@ impl Create {
 
  wallet::initialize(wallet, &options, mnemonic.to_seed(self.passphrase.clone()))?;
 
- Ok(Box::new(Output {
+ Ok(Some(Box::new(Output {
  mnemonic,
  passphrase: Some(self.passphrase),
- }))
+ })))
  }
 }

src/subcommand/wallet/etch.rs

@@ -124,9 +124,9 @@ impl Etch {
 
  let transaction = client.send_raw_transaction(&signed_transaction)?;
 
- Ok(Box::new(Output {
+ Ok(Some(Box::new(Output {
  rune: self.rune,
  transaction,
- }))
+ })))
  }
 }

src/subcommand/wallet/inscribe/batch.rs

@@ -62,12 +62,12 @@ impl Batch {
  )?;
 
  if self.dry_run {
- return Ok(Box::new(self.output(
+ return Ok(Some(Box::new(self.output(
  commit_tx.txid(),
  reveal_tx.txid(),
  total_fees,
  self.inscriptions.clone(),
- )));
+ ))));
  }
 
  let signed_commit_tx = client
@@ -114,12 +114,12 @@ impl Batch {
  }
  };
 
- Ok(Box::new(self.output(
+ Ok(Some(Box::new(self.output(
  commit,
  reveal,
  total_fees,
  self.inscriptions.clone(),
- )))
+ ))))
  }
 
  fn output(

src/subcommand/wallet/inscriptions.rs

@@ -38,5 +38,5 @@ pub(crate) fn run(wallet: String, options: Options) -> SubcommandResult {
  }
  }
 
- Ok(Box::new(output))
+ Ok(Some(Box::new(output)))
 }

src/subcommand/wallet/outputs.rs

@@ -21,5 +21,5 @@ pub(crate) fn run(wallet: String, options: Options) -> SubcommandResult {
  });
  }
 
- Ok(Box::new(outputs))
+ Ok(Some(Box::new(outputs)))
 }

src/subcommand/wallet/receive.rs

@@ -9,5 +9,5 @@ pub(crate) fn run(wallet: String, options: Options) -> SubcommandResult {
  let address = bitcoin_rpc_client_for_wallet_command(wallet, &options)?
  .get_new_address(None, Some(bitcoincore_rpc::json::AddressType::Bech32m))?;
 
- Ok(Box::new(Output { address }))
+ Ok(Some(Box::new(Output { address })))
 }

src/subcommand/wallet/restore.rs

@@ -20,6 +20,6 @@ impl Restore {
  self.mnemonic.to_seed(self.passphrase),
  )?;
 
- Ok(Box::new(Empty {}))
+ Ok(None)
  }
 }

src/subcommand/wallet/sats.rs

@@ -49,7 +49,7 @@ impl Sats {
  output: outpoint,
  });
  }
- Ok(Box::new(output))
+ Ok(Some(Box::new(output)))
  } else {
  let mut output = Vec::new();
  for (outpoint, sat, offset, rarity) in rare_sats(utxos) {
@@ -60,7 +60,7 @@ impl Sats {
  rarity,
  });
  }
- Ok(Box::new(output))
+ Ok(Some(Box::new(output)))
  }
  }
 }

src/subcommand/wallet/send.rs

@@ -46,7 +46,7 @@ impl Send {
  Outgoing::Amount(amount) => {
  Self::lock_non_cardinal_outputs(&client, &inscriptions, &runic_outputs, unspent_outputs)?;
  let transaction = Self::send_amount(&client, amount, address, self.fee_rate)?;
- return Ok(Box::new(Output { transaction }));
+ return Ok(Some(Box::new(Output { transaction })));
  }
  Outgoing::InscriptionId(id) => index
  .get_inscription_satpoint_by_id(id)?
@@ -64,7 +64,7 @@ impl Send {
  runic_outputs,
  unspent_outputs,
  )?;
- return Ok(Box::new(Output { transaction }));
+ return Ok(Some(Box::new(Output { transaction })));
  }
  Outgoing::SatPoint(satpoint) => {
  for inscription_satpoint in inscriptions.keys() {
@@ -112,7 +112,7 @@ impl Send {
 
  let txid = client.send_raw_transaction(&signed_tx)?;
 
- Ok(Box::new(Output { transaction: txid }))
+ Ok(Some(Box::new(Output { transaction: txid })))
  }
 
  fn lock_non_cardinal_outputs(

src/subcommand/wallet/transactions.rs

@@ -29,6 +29,6 @@ impl Transactions {
  });
  }
 
- Ok(Box::new(output))
+ Ok(Some(Box::new(output)))
  }
 }