Skip to content

Commit dbc6a1e

Browse files
committed
Merge #1774: chore[chain,wallet]: fix build warnings
479117c chore(chain,wallet): fix build warnings (Steve Myers) Pull request description: ### Description fixed #1773 ### Notes to the reviewers I noticed these warnings while publishing beta.6 and would like to get them fixed before the final `bdk_wallet` 1.0.0. With default features we should have any build warnings. To reproduce: ``` cargo build -p bdk_chain cargo build -p bdk_wallet ``` ### Checklists #### All Submissions: * [x] I've signed all my commits * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk/blob/master/CONTRIBUTING.md) * [x] I ran `cargo fmt` and `cargo clippy` before committing ACKs for top commit: ValuedMammal: ACK 479117c Tree-SHA512: d9b18f0472ed3a3088c24f46b49361154dd568d95045bee6108a7f6ace84d0da19cfe1079b8549a5ba723e0ded9bca502f0ebf2d557ff4f23ac87ee51e6c335a
2 parents c53781b + 479117c commit dbc6a1e

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

crates/chain/src/tx_graph.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,11 @@ impl<A: Clone + Ord> TxGraph<A> {
460460
///
461461
/// The supplied closure returns an `Option<T>`, allowing the caller to map each node it visits
462462
/// and decide whether to visit descendants.
463-
pub fn walk_descendants<'g, F, O>(&'g self, txid: Txid, walk_map: F) -> TxDescendants<A, F, O>
463+
pub fn walk_descendants<'g, F, O>(
464+
&'g self,
465+
txid: Txid,
466+
walk_map: F,
467+
) -> TxDescendants<'g, A, F, O>
464468
where
465469
F: FnMut(usize, Txid) -> Option<O> + 'g,
466470
{
@@ -477,7 +481,7 @@ impl<A> TxGraph<A> {
477481
&'g self,
478482
tx: &'g Transaction,
479483
walk_map: F,
480-
) -> TxDescendants<A, F, O>
484+
) -> TxDescendants<'g, A, F, O>
481485
where
482486
F: FnMut(usize, Txid) -> Option<O> + 'g,
483487
{
@@ -495,7 +499,7 @@ impl<A> TxGraph<A> {
495499
pub fn direct_conflicts<'g>(
496500
&'g self,
497501
tx: &'g Transaction,
498-
) -> impl Iterator<Item = (usize, Txid)> + '_ {
502+
) -> impl Iterator<Item = (usize, Txid)> + 'g {
499503
let txid = tx.compute_txid();
500504
tx.input
501505
.iter()

crates/wallet/src/wallet/changeset.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use alloc::string::String;
21
use bdk_chain::{
32
indexed_tx_graph, keychain_txout, local_chain, tx_graph, ConfirmationBlockTime, Merge,
43
};
@@ -73,7 +72,7 @@ impl ChangeSet {
7372
pub const WALLET_TABLE_NAME: &'static str = "bdk_wallet";
7473

7574
/// Get v0 sqlite [ChangeSet] schema
76-
pub fn schema_v0() -> String {
75+
pub fn schema_v0() -> alloc::string::String {
7776
format!(
7877
"CREATE TABLE {} ( \
7978
id INTEGER PRIMARY KEY NOT NULL CHECK (id = 0), \

0 commit comments

Comments
 (0)