Merge pull request #92 from rustaceanrob/wallet-less-1-7

Remove `wallet` and `rusqlite` features
bitcoindevkit · Jan 9, 2025 · 965582b · 965582b
2 parents 302b6b5 + 6a78935
commit 965582b
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 239 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,20 +12,14 @@ edition = "2021"
 rust-version = "1.63.0"
 
 [dependencies]
-bdk_chain = { version = "0.21.1" }
-kyoto-cbf = { version = "0.6.0", default-features = false, features = ["dns"] }
+bdk_wallet = { version = "1.0.0" }
+kyoto-cbf = { version = "0.6.0", default-features = false, features = ["dns", "database"] }
 tracing = { version = "0.1", optional = true }
 tracing-subscriber = { version = "0.3", optional = true }
 
-[dependencies.bdk_wallet]
-version = "1.0.0"
-optional = true
-
 [features]
-default = ["wallet", "rusqlite", "events", "callbacks", "trace"]
+default = ["events", "callbacks", "trace"]
 trace = ["tracing", "tracing-subscriber"]
-wallet = ["bdk_wallet"]
-rusqlite = ["kyoto-cbf/database"]
 callbacks = []
 events = []
 
@@ -39,13 +33,9 @@ tracing-subscriber = { version = "0.3" }
 
 
 [[example]]
-name = "signet"
-required-features = ["rusqlite", "callbacks"]
-
-[[example]]
-name = "wallet"
-required-features = ["wallet", "trace", "rusqlite", "callbacks"]
+name = "callbacks"
+required-features = ["trace", "callbacks"]
 
 [[example]]
 name = "events"
-required-features = ["wallet", "rusqlite", "events"]
+required-features = ["events"]
diff --git a/examples/wallet.rs → examples/callbacks.rs b/examples/wallet.rs → examples/callbacks.rs
diff --git a/examples/signet.rs b/examples/signet.rs
diff --git a/src/builder.rs b/src/builder.rs
@@ -47,7 +47,7 @@
 
 use std::{path::PathBuf, time::Duration};
 
-use bdk_chain::local_chain::MissingGenesisError;
+use bdk_wallet::chain::local_chain::MissingGenesisError;
 use bdk_wallet::Wallet;
 use kyoto::NodeBuilder;
 pub use kyoto::{
@@ -157,8 +157,11 @@ impl LightClientBuilder {
             .add_scripts(wallet.peek_revealed_plus_lookahead().collect())
             .build_node()?;
         let (sender, receiver) = kyoto_client.split();
-        let event_receiver =
-            EventReceiver::from_index(wallet.local_chain().tip(), wallet.spk_index(), receiver)?;
+        let event_receiver = EventReceiver::from_index(
+            wallet.local_chain().tip(),
+            wallet.spk_index().clone(),
+            receiver,
+        )?;
         Ok(LightClient {
             sender,
             receiver: event_receiver,