Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions crates/chain/src/tx_graph.rs
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,11 @@ impl<A: Clone + Ord> TxGraph<A> {
///
/// The supplied closure returns an `Option<T>`, allowing the caller to map each node it visits
/// and decide whether to visit descendants.
pub fn walk_descendants<'g, F, O>(&'g self, txid: Txid, walk_map: F) -> TxDescendants<A, F, O>
pub fn walk_descendants<'g, F, O>(
&'g self,
txid: Txid,
walk_map: F,
) -> TxDescendants<'g, A, F, O>
where
F: FnMut(usize, Txid) -> Option<O> + 'g,
{
Expand All @@ -477,7 +481,7 @@ impl<A> TxGraph<A> {
&'g self,
tx: &'g Transaction,
walk_map: F,
) -> TxDescendants<A, F, O>
) -> TxDescendants<'g, A, F, O>
where
F: FnMut(usize, Txid) -> Option<O> + 'g,
{
Expand All @@ -495,7 +499,7 @@ impl<A> TxGraph<A> {
pub fn direct_conflicts<'g>(
&'g self,
tx: &'g Transaction,
) -> impl Iterator<Item = (usize, Txid)> + '_ {
) -> impl Iterator<Item = (usize, Txid)> + 'g {
let txid = tx.compute_txid();
tx.input
.iter()
Expand Down
3 changes: 1 addition & 2 deletions crates/wallet/src/wallet/changeset.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use alloc::string::String;
use bdk_chain::{
indexed_tx_graph, keychain_txout, local_chain, tx_graph, ConfirmationBlockTime, Merge,
};
Expand Down Expand Up @@ -73,7 +72,7 @@ impl ChangeSet {
pub const WALLET_TABLE_NAME: &'static str = "bdk_wallet";

/// Get v0 sqlite [ChangeSet] schema
pub fn schema_v0() -> String {
pub fn schema_v0() -> alloc::string::String {
format!(
"CREATE TABLE {} ( \
id INTEGER PRIMARY KEY NOT NULL CHECK (id = 0), \
Expand Down
Loading