From a78967e51ba1fa94f00a0f7a580dfc009428a947 Mon Sep 17 00:00:00 2001
From: LLFourn <lloyd.fourn@gmail.com>
Date: Sat, 13 May 2023 11:03:03 +0800
Subject: [PATCH] [example-cli] simplify new address logic

---
 example-crates/example_cli/src/lib.rs | 34 ++++++++++++---------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/example-crates/example_cli/src/lib.rs b/example-crates/example_cli/src/lib.rs
index 6ac40455..029ccbd4 100644
--- a/example-crates/example_cli/src/lib.rs
+++ b/example-crates/example_cli/src/lib.rs
@@ -10,7 +10,7 @@ use bdk_chain::{
         psbt::Prevouts,
         secp256k1::{self, Secp256k1},
         util::sighash::SighashCache,
-        Address, LockTime, Network, Script, Sequence, Transaction, TxIn, TxOut,
+        Address, LockTime, Network, Sequence, Transaction, TxIn, TxOut,
     },
     indexed_tx_graph::{IndexedAdditions, IndexedTxGraph},
     keychain::{DerivationAdditions, KeychainTxOutIndex},
@@ -219,8 +219,17 @@ pub fn run_address_cmd<A, X>(
 where
     ChangeSet<A, X>: Default + Append + DeserializeOwned + Serialize,
 {
-    let process_spk = |spk_i: u32, spk: &Script, index_additions: DerivationAdditions<Keychain>| {
-        if !index_additions.is_empty() {
+    let index = &mut graph.index;
+
+    match cmd {
+        AddressCmd::Next | AddressCmd::New => {
+            let spk_chooser = match cmd {
+                AddressCmd::Next => KeychainTxOutIndex::next_unused_spk,
+                AddressCmd::New => KeychainTxOutIndex::reveal_next_spk,
+                _ => unreachable!("only these two variants exist in match arm"),
+            };
+
+            let ((spk_i, spk), index_additions) = spk_chooser(index, &Keychain::External);
             let db = &mut *db.lock().unwrap();
             db.stage(ChangeSet {
                 indexed_additions: IndexedAdditions {
@@ -230,22 +239,9 @@ where
                 ..Default::default()
             });
             db.commit()?;
-        }
-        let addr = Address::from_script(spk, network).context("failed to derive address")?;
-        println!("[address @ {}] {}", spk_i, addr);
-        Ok(())
-    };
-
-    let index = &mut graph.index;
-
-    match cmd {
-        AddressCmd::Next => {
-            let ((spk_i, spk), index_additions) = index.next_unused_spk(&Keychain::External);
-            process_spk(spk_i, spk, index_additions)
-        }
-        AddressCmd::New => {
-            let ((spk_i, spk), index_additions) = index.reveal_next_spk(&Keychain::External);
-            process_spk(spk_i, spk, index_additions)
+            let addr = Address::from_script(spk, network).context("failed to derive address")?;
+            println!("[address @ {}] {}", spk_i, addr);
+            Ok(())
         }
         AddressCmd::Index => {
             for (keychain, derivation_index) in index.last_revealed_indices() {