Rename ord wallet satoshis to ord wallet sats (ordinals#1004)

popcnt1 · Dec 19, 2022 · d965ba0 · d965ba0
1 parent 2220054
commit d965ba0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/docs/src/bounty/3.md b/docs/src/bounty/3.md
@@ -33,7 +33,7 @@ To search an `ord` wallet for sats with a name in `frequency.tsv`, use the
 following [`ord`](https://github.com/casey/ord) command:
 
 ```
-ord wallet satoshis --tsv frequency.tsv
+ord wallet sats --tsv frequency.tsv
 ```
 
 ### Part 0

diff --git a/docs/src/guides/sat-hunting.md b/docs/src/guides/sat-hunting.md
@@ -67,7 +67,7 @@ wallet is named `foo`:
 2. Display any rare ordinals wallet `foo`'s UTXOs:
 
    ```sh
-   ord wallet satoshis
+   ord wallet sats
    ```
 
 ### Searching for Rare Ordinals in a Non-Bitcoin Core Wallet
@@ -130,7 +130,7 @@ your wallet of funds.
 7. Display your wallet's rare ordinals:
 
    ```sh
-   ord wallet satoshis
+   ord wallet sats
    ```
 
 ### Searching for Rare Ordinals in a Wallet that Exports Multi-path Descriptors
@@ -231,7 +231,7 @@ those multiple descriptors into Bitcoin Core.
 7. Display your wallet's rare ordinals:
 
    ```sh
-   ord wallet satoshis
+   ord wallet sats
    ```
 
 ### Exporting Descriptors

diff --git a/src/subcommand/wallet.rs b/src/subcommand/wallet.rs
@@ -4,7 +4,7 @@ mod create;
 mod inscribe;
 mod inscriptions;
 mod receive;
-mod satoshis;
+mod sats;
 mod send;
 mod transaction_builder;
 mod transactions;
@@ -21,7 +21,7 @@ pub(crate) enum Wallet {
   #[clap(about = "Generate a receive address")]
   Receive(receive::Receive),
   #[clap(about = "List wallet satoshis")]
-  Satoshis(satoshis::Satoshis),
+  Sats(sats::Sats),
   #[clap(about = "Send a satoshi or inscription")]
   Send(send::Send),
   #[clap(about = "See wallet transactions")]
@@ -37,7 +37,7 @@ impl Wallet {
       Self::Inscribe(inscribe) => inscribe.run(options),
       Self::Inscriptions(inscriptions) => inscriptions.run(options),
       Self::Receive(receive) => receive.run(options),
-      Self::Satoshis(satoshis) => satoshis.run(options),
+      Self::Sats(sats) => sats.run(options),
       Self::Send(send) => send.run(options),
       Self::Transactions(transactions) => transactions.run(options),
       Self::Utxos(utxos) => utxos.run(options),

diff --git a/src/subcommand/wallet/satoshis.rs → src/subcommand/wallet/sats.rs b/src/subcommand/wallet/satoshis.rs → src/subcommand/wallet/sats.rs
@@ -1,15 +1,15 @@
 use super::*;
 
 #[derive(Debug, Parser)]
-pub(crate) struct Satoshis {
+pub(crate) struct Sats {
   #[clap(
     long,
     help = "Find satoshis listed in first column of tab-separated value file <TSV>."
   )]
   tsv: Option<PathBuf>,
 }
 
-impl Satoshis {
+impl Sats {
   pub(crate) fn run(&self, options: Options) -> Result {
     let index = Index::open(&options)?;
     index.update()?;

diff --git a/tests/wallet.rs b/tests/wallet.rs
@@ -1,11 +1,11 @@
 use {super::*, std::str::FromStr};
 
 #[test]
-fn satoshis() {
+fn sats() {
   let rpc_server = test_bitcoincore_rpc::spawn();
   let second_coinbase = rpc_server.mine_blocks(1)[0].txdata[0].txid();
 
-  CommandBuilder::new("--index-sats wallet satoshis")
+  CommandBuilder::new("--index-sats wallet sats")
     .rpc_server(&rpc_server)
     .expected_stdout(format!(
       "{}\t{}\t0\tuncommon\n",
@@ -16,11 +16,11 @@ fn satoshis() {
 }
 
 #[test]
-fn satoshis_from_tsv_success() {
+fn sats_from_tsv_success() {
   let rpc_server = test_bitcoincore_rpc::spawn();
   let second_coinbase = rpc_server.mine_blocks(1)[0].txdata[0].txid();
 
-  CommandBuilder::new("--index-sats wallet satoshis --tsv foo.tsv")
+  CommandBuilder::new("--index-sats wallet sats --tsv foo.tsv")
     .write("foo.tsv", "nvtcsezkbtg")
     .rpc_server(&rpc_server)
     .expected_stdout(format!(
@@ -31,9 +31,9 @@ fn satoshis_from_tsv_success() {
 }
 
 #[test]
-fn satoshis_from_tsv_parse_error() {
+fn sats_from_tsv_parse_error() {
   let rpc_server = test_bitcoincore_rpc::spawn();
-  CommandBuilder::new("wallet satoshis --tsv foo.tsv")
+  CommandBuilder::new("wallet sats --tsv foo.tsv")
     .write("foo.tsv", "===")
     .rpc_server(&rpc_server)
     .expected_exit_code(1)
@@ -44,9 +44,9 @@ fn satoshis_from_tsv_parse_error() {
 }
 
 #[test]
-fn satoshis_from_tsv_file_not_found() {
+fn sats_from_tsv_file_not_found() {
   let rpc_server = test_bitcoincore_rpc::spawn();
-  CommandBuilder::new("wallet satoshis --tsv foo.tsv")
+  CommandBuilder::new("wallet sats --tsv foo.tsv")
     .rpc_server(&rpc_server)
     .expected_exit_code(1)
     .stderr_regex("error: I/O error reading `.*`\nbecause: .*\n")