From bd6eca042b9eca6cdeb7bb28e4b539ac5dde40b8 Mon Sep 17 00:00:00 2001
From: Steve Myers <steve@notmandatory.org>
Date: Wed, 11 Dec 2024 22:35:04 -0600
Subject: [PATCH] chore[chain,wallet]: fix build warnings

---
 crates/chain/src/tx_graph.rs          | 10 +++++++---
 crates/wallet/src/wallet/changeset.rs |  3 +--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/crates/chain/src/tx_graph.rs b/crates/chain/src/tx_graph.rs
index 6659e0352..0207f242e 100644
--- a/crates/chain/src/tx_graph.rs
+++ b/crates/chain/src/tx_graph.rs
@@ -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,
     {
@@ -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,
     {
@@ -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()
diff --git a/crates/wallet/src/wallet/changeset.rs b/crates/wallet/src/wallet/changeset.rs
index 36a5b4936..94dba2b7d 100644
--- a/crates/wallet/src/wallet/changeset.rs
+++ b/crates/wallet/src/wallet/changeset.rs
@@ -1,4 +1,3 @@
-use alloc::string::String;
 use bdk_chain::{
     indexed_tx_graph, keychain_txout, local_chain, tx_graph, ConfirmationBlockTime, Merge,
 };
@@ -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), \