Skip to content

Add the equivalent of ForEach::as_key() for PkPkh #390

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 9, 2022
Merged

Add the equivalent of ForEach::as_key() for PkPkh #390

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions src/miniscript/iter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,16 @@ pub enum PkPkh<Pk: MiniscriptKey> {
HashedPubkey(Pk::Hash),
}

impl<Pk: MiniscriptKey<Hash = Pk>> PkPkh<Pk> {
/// Convenience method to avoid distinguishing between keys and hashes when these are the same type
pub fn as_key(self) -> Pk {
match self {
PkPkh::PlainPubkey(pk) => pk,
PkPkh::HashedPubkey(pkh) => pkh,
}
}
}

/// Iterator for traversing all [MiniscriptKey]'s and hashes, depending what data are present in AST,
/// starting from some specific node which constructs the iterator via
/// [Miniscript::iter_pk_pkh] method.
Expand Down