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, lint and manifest for wasm-testing #53

Merged
merged 3 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
2 changes: 1 addition & 1 deletion derive/src/xkey.rs
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@
self.derivation.iter().copied().map(DerivationIndex::from).collect()
}

pub fn child_derivation<'a>(&'a self, child: &'a KeyOrigin) -> Option<&[DerivationIndex]> {
pub fn child_derivation<'a>(&'a self, child: &'a KeyOrigin) -> Option<&'a [DerivationIndex]> {

Check warning on line 645 in derive/src/xkey.rs

View check run for this annotation

Codecov / codecov/patch

derive/src/xkey.rs#L645

Added line #L645 was not covered by tests
if self.master_fp() == child.master_fp() {
let d = child.derivation();
let shared = d.shared_prefix(self.derivation());
Expand Down
2 changes: 1 addition & 1 deletion descriptors/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords = { workspace = true }
categories = { workspace = true }
readme = "../README.md"
authors = { workspace = true }
homepage = { workspace = true }
homepage.workspace = true
repository = { workspace = true }
rust-version = { workspace = true }
edition = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion psbt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords = { workspace = true }
categories = { workspace = true }
readme = "../README.md"
authors = { workspace = true }
homepage = { workspace = true }
homepage.workspace = true
repository = { workspace = true }
rust-version = { workspace = true }
edition = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions psbt/src/coders.rs
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ pub trait Encode {
fn encode(&self, writer: &mut dyn Write) -> Result<usize, IoError>;
}

impl<'a, T: Encode> Encode for &'a T {
impl<T: Encode> Encode for &'_ T {
fn encode(&self, writer: &mut dyn Write) -> Result<usize, IoError> { (*self).encode(writer) }
}

Expand Down Expand Up @@ -677,7 +677,7 @@ macro_rules! psbt_code_using_consensus {
}

struct WriteWrap<'a>(&'a mut dyn Write);
impl<'a> Write for WriteWrap<'a> {
impl Write for WriteWrap<'_> {
fn write(&mut self, buf: &[u8]) -> io::Result<usize> { self.0.write(buf) }
fn flush(&mut self) -> io::Result<()> { self.0.flush() }
}
Expand Down
2 changes: 1 addition & 1 deletion psbt/src/data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,7 @@
if terminal.len() != 1 {
return None;
}
return terminal.first().copied();
terminal.first().copied()

Check warning on line 1044 in psbt/src/data.rs

View check run for this annotation

Codecov / codecov/patch

psbt/src/data.rs#L1044

Added line #L1044 was not covered by tests
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/signers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,15 @@ impl<'a> TestnetRefSigner<'a> {
}
}

impl<'a> Signer for TestnetRefSigner<'a> {
impl Signer for TestnetRefSigner<'_> {
type Sign<'s>
= Self
where Self: 's;

fn approve(&self, _: &Psbt) -> Result<Self::Sign<'_>, Rejected> { Ok(self.clone()) }
}

impl<'a> TestnetRefSigner<'a> {
impl TestnetRefSigner<'_> {
fn get(&self, origin: Option<&KeyOrigin>) -> Option<Xpriv> {
let origin = origin?;
self.keys.iter().find_map(|(xo, xpriv)| {
Expand All @@ -100,7 +100,7 @@ impl<'a> TestnetRefSigner<'a> {
}
}

impl<'a> Sign for TestnetRefSigner<'a> {
impl Sign for TestnetRefSigner<'_> {
fn sign_ecdsa(
&self,
message: Sighash,
Expand Down