refactor(persist): update file_store, sqlite, wallet to use bdk_chain…

…::persist

Also update examples and remove bdk_persist crate.

Cargo.toml

@@ -9,7 +9,6 @@ members = [
  "crates/esplora",
  "crates/bitcoind_rpc",
  "crates/hwi",
- "crates/persist",
  "crates/testenv",
  "example-crates/example_cli",
  "example-crates/example_electrum",

crates/chain/src/persist.rs

@@ -1,18 +1,18 @@
 //! This module is home to the [`Persist`] trait which defines the behavior of a data store
 //! required to persist changes made to BDK data structures.
 //!
-//! The [`Stage`] type provides a convenient wrapper around implementations of [`Persist`] that
+//! The [`StagedPersist`] type provides a convenient wrapper around implementations of [`Persist`] that
 //! allows changes to be staged before committing them.
 //!
 //! The [`CombinedChangeSet`] type encapsulates a combination of [`crate`] structures that are
 //! typically persisted together.
 
 use crate::{indexed_tx_graph, keychain, local_chain, Anchor, Append};
 use bitcoin::Network;
+use core::convert::Infallible;
 use core::default::Default;
 use core::fmt::{Debug, Display};
-use std::convert::Infallible;
-use std::mem;
+use core::mem;
 
 /// A changeset containing [`crate`] structures typically persisted together.
 #[derive(Debug, Clone, PartialEq)]
@@ -151,7 +151,7 @@ where
  P: Persist<C>,
 {
  /// Create a new [`StagedPersist`] adding staging to an inner data store that implements
- /// [`Persit`].
+ /// [`Persist`].
  pub fn new(persist: P) -> Self {
  Self {
  inner: persist,
@@ -214,6 +214,7 @@ mod test {
 
  use crate::persist::{Persist, StagedPersist};
  use crate::Append;
+ use std::error::Error;
  use std::fmt::{self, Display, Formatter};
  use std::prelude::rust_2015::{String, ToString};
  use TestError::FailedWrite;
@@ -234,6 +235,8 @@ mod test {
  }
  }
 
+ impl Error for TestError {}
+
  #[derive(Clone, Default)]
  struct TestChangeSet(Option<String>);
 

crates/file_store/Cargo.toml

@@ -11,9 +11,7 @@ authors = ["Bitcoin Dev Kit Developers"]
 readme = "README.md"
 
 [dependencies]
-anyhow = { version = "1", default-features = false }
 bdk_chain = { path = "../chain", version = "0.15.0", features = [ "serde", "miniscript" ] }
-bdk_persist = { path = "../persist", version = "0.3.0"}
 bincode = { version = "1" }
 serde = { version = "1", features = ["derive"] }
 

crates/file_store/README.md

@@ -1,6 +1,6 @@
 # BDK File Store
 
-This is a simple append-only flat file implementation of [`PersistBackend`](bdk_persist::PersistBackend).
+This is a simple append-only flat file implementation of [`Persist`](bdk_chain::persist::Persist).
 
 The main structure is [`Store`] which works with any [`bdk_chain`] based changesets to persist data into a flat file.
 

crates/file_store/src/store.rs

@@ -1,7 +1,6 @@
 use crate::{bincode_options, EntryIter, FileError, IterError};
-use anyhow::anyhow;
+use bdk_chain::persist::Persist;
 use bdk_chain::Append;
-use bdk_persist::PersistBackend;
 use bincode::Options;
 use std::{
  fmt::{self, Debug},
@@ -22,22 +21,24 @@ where
  marker: PhantomData<C>,
 }
 
-impl<C> PersistBackend<C> for Store<C>
+impl<C> Persist<C> for Store<C>
 where
  C: Append
+ + Debug
  + serde::Serialize
  + serde::de::DeserializeOwned
  + core::marker::Send
  + core::marker::Sync,
 {
- fn write_changes(&mut self, changeset: &C) -> anyhow::Result<()> {
+ type WriteError = io::Error;
+ type LoadError = AggregateChangesetsError<C>;
+
+ fn write_changes(&mut self, changeset: &C) -> Result<(), Self::WriteError> {
  self.append_changeset(changeset)
- .map_err(|e| anyhow!(e).context("failed to write changes to persistence backend"))
  }
 
- fn load_from_persistence(&mut self) -> anyhow::Result<Option<C>> {
+ fn load_changes(&mut self) -> Result<Option<C>, Self::LoadError> {
  self.aggregate_changesets()
- .map_err(|e| anyhow!(e.iter_error).context("error loading from persistence backend"))
  }
 }
 

crates/sqlite/Cargo.toml

@@ -11,9 +11,7 @@ authors = ["Bitcoin Dev Kit Developers"]
 readme = "README.md"
 
 [dependencies]
-anyhow = { version = "1", default-features = false }
 bdk_chain = { path = "../chain", version = "0.15.0", features = ["serde", "miniscript"] }
-bdk_persist = { path = "../persist", version = "0.3.0", features = ["serde"] }
 rusqlite = { version = "0.31.0", features = ["bundled"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"

crates/sqlite/README.md

@@ -1,8 +1,8 @@
 # BDK SQLite
 
-This is a simple [SQLite] relational database schema backed implementation of [`PersistBackend`](bdk_persist::PersistBackend).
+This is a simple [SQLite] relational database schema backed implementation of `Persist`.
 
-The main structure is `Store` which persists [`bdk_persist`] `CombinedChangeSet` data into a SQLite database file.
+The main structure is `Store` which persists `CombinedChangeSet` data into a SQLite database file.
 
-[`bdk_persist`]:https://docs.rs/bdk_persist/latest/bdk_persist/
+<!-- [`Persist`]: bdk_chain::persist::PersistBackend -->
 [SQLite]: https://www.sqlite.org/index.html