Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix nightly build and lint #76

Merged
merged 2 commits into from
Dec 17, 2024
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
6 changes: 3 additions & 3 deletions src/hot/signer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ pub struct XprivSigner<'xpriv> {
// TODO: Support key- and script-path selection
}

impl<'descr, 'me, D: Descriptor> Signer for ConsoleSigner<'descr, 'me, D>
impl<'me, D: Descriptor> Signer for ConsoleSigner<'_, 'me, D>
where Self: 'me
{
type Sign<'s>
Expand All @@ -60,7 +60,7 @@ where Self: 'me
fn approve(&self, _psbt: &Psbt) -> Result<Self::Sign<'_>, Rejected> { Ok(&self.signer) }
}

impl<'xpriv> XprivSigner<'xpriv> {
impl XprivSigner<'_> {
fn derive_subkey(&self, origin: Option<&KeyOrigin>) -> Option<Xpriv> {
let origin = origin?;
if !self.account.origin().is_subset_of(origin) {
Expand All @@ -74,7 +74,7 @@ impl<'xpriv> XprivSigner<'xpriv> {
}
}

impl<'a, 'xpriv> Sign for &'a XprivSigner<'xpriv> {
impl Sign for &'_ XprivSigner<'_> {
fn sign_ecdsa(
&self,
message: Sighash,
Expand Down
4 changes: 2 additions & 2 deletions src/wallet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
_phantom: PhantomData<K>,
}

impl<'descr, K, D: Descriptor<K>> Iterator for AddrIter<'descr, K, D> {
impl<K, D: Descriptor<K>> Iterator for AddrIter<'_, K, D> {
type Item = DerivedAddr;

fn next(&mut self) -> Option<Self::Item> {
Expand Down Expand Up @@ -625,7 +625,7 @@
&'a self,
up_to: Sats,
selector: impl Fn(&WalletUtxo) -> bool + 'a,
) -> impl Iterator<Item = Outpoint> + '_ {
) -> impl Iterator<Item = Outpoint> + 'a {

Check warning on line 628 in src/wallet.rs

View check run for this annotation

Codecov / codecov/patch

src/wallet.rs#L628

Added line #L628 was not covered by tests
let mut selected = Sats::ZERO;
self.utxos()
.filter(selector)
Expand Down