From: Steve Myers Date: Thu, 12 Dec 2024 04:35:04 +0000 (-0600) Subject: chore(chain,wallet): fix build warnings X-Git-Tag: core-0.4.1~3^2 X-Git-Url: http://internal-gitweb-vhost/script/%22https:/database/scripts/enum.FromSliceError.html?a=commitdiff_plain;h=479117c2071a9062438e3b94c2c6cf70ff6fb3c0;p=bdk chore(chain,wallet): fix build warnings --- diff --git a/crates/chain/src/tx_graph.rs b/crates/chain/src/tx_graph.rs index 6659e035..0207f242 100644 --- a/crates/chain/src/tx_graph.rs +++ b/crates/chain/src/tx_graph.rs @@ -460,7 +460,11 @@ impl TxGraph { /// /// The supplied closure returns an `Option`, 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 + 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 + 'g, { @@ -477,7 +481,7 @@ impl TxGraph { &'g self, tx: &'g Transaction, walk_map: F, - ) -> TxDescendants + ) -> TxDescendants<'g, A, F, O> where F: FnMut(usize, Txid) -> Option + 'g, { @@ -495,7 +499,7 @@ impl TxGraph { pub fn direct_conflicts<'g>( &'g self, tx: &'g Transaction, - ) -> impl Iterator + '_ { + ) -> impl Iterator + '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 36a5b493..94dba2b7 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), \