refactor: Allow for no chain update

bitcoindevkit · Aug 24, 2023 · 5ca099f · 5ca099f
1 parent ebe28bd
commit 5ca099f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/crates/bdk/src/wallet/mod.rs b/crates/bdk/src/wallet/mod.rs
@@ -109,7 +109,7 @@ pub struct WalletUpdate<K, A> {
     /// Update for the [`LocalChain`].
     ///
     /// [`LocalChain`]: local_chain::LocalChain
-    pub chain: local_chain::Update,
+    pub chain: Option<local_chain::Update>,
 }
 
 impl<K, A> WalletUpdate<K, A> {
@@ -118,7 +118,7 @@ impl<K, A> WalletUpdate<K, A> {
         Self {
             last_active_indices: BTreeMap::new(),
             graph: TxGraph::default(),
-            chain: chain_update,
+            chain: Some(chain_update),
         }
     }
 }
@@ -1804,7 +1804,11 @@ impl<D> Wallet<D> {
     where
         D: PersistBackend<ChangeSet>,
     {
-        let mut changeset = ChangeSet::from(self.chain.apply_update(update.chain)?);
+        let mut changeset = match update.chain {
+            Some(chain_update) => ChangeSet::from(self.chain.apply_update(chain_update)?),
+            None => ChangeSet::default(),
+        };
+
         let (_, index_changeset) = self
             .indexed_graph
             .index

diff --git a/example-crates/wallet_electrum/src/main.rs b/example-crates/wallet_electrum/src/main.rs
@@ -63,10 +63,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let wallet_update = WalletUpdate {
         last_active_indices: electrum_update.keychain_update,
         graph: electrum_update.graph_update,
-        chain: local_chain::Update {
+        chain: Some(local_chain::Update {
             tip: electrum_update.new_tip,
             introduce_older_blocks: true,
-        },
+        }),
     };
     wallet.apply_update(wallet_update)?;
     wallet.commit()?;