Skip to content

Commit b6593d6

Browse files
committed
Backport unit test from #818
1 parent ed0661b commit b6593d6

File tree

1 file changed

+6
-15
lines changed

1 file changed

+6
-15
lines changed

src/descriptor/mod.rs

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2073,19 +2073,13 @@ pk(03f28773c2d975288bc7d1d205c3748651b075fbc6610e58cddeeddf8f19405aa8))";
20732073

20742074
struct TranslateFullPk;
20752075

2076-
impl Translator<bitcoin::PublicKey> for TranslateFullPk {
2077-
type TargetPk = DefiniteDescriptorKey;
2078-
type Error = core::convert::Infallible;
2079-
2080-
fn pk(
2081-
&mut self,
2082-
pk: &bitcoin::PublicKey,
2083-
) -> Result<DefiniteDescriptorKey, Self::Error> {
2076+
impl Translator<bitcoin::PublicKey, DefiniteDescriptorKey, ()> for TranslateFullPk {
2077+
fn pk(&mut self, pk: &bitcoin::PublicKey) -> Result<DefiniteDescriptorKey, ()> {
20842078
Ok(DefiniteDescriptorKey::new(DescriptorPublicKey::from(*pk))
20852079
.expect("DescriptorPublicKey from PublicKey has no wildcards"))
20862080
}
20872081

2088-
translate_hash_clone!(bitcoin::PublicKey, DefiniteDescriptorKey, Self::Error);
2082+
translate_hash_clone!(bitcoin::PublicKey, DefiniteDescriptorKey, ());
20892083
}
20902084

20912085
let converted_descriptor = full_pk_descriptor
@@ -2100,16 +2094,13 @@ pk(03f28773c2d975288bc7d1d205c3748651b075fbc6610e58cddeeddf8f19405aa8))";
21002094

21012095
struct TranslateXOnlyPk;
21022096

2103-
impl Translator<XOnlyPublicKey> for TranslateXOnlyPk {
2104-
type TargetPk = DefiniteDescriptorKey;
2105-
type Error = core::convert::Infallible;
2106-
2107-
fn pk(&mut self, pk: &XOnlyPublicKey) -> Result<DefiniteDescriptorKey, Self::Error> {
2097+
impl Translator<XOnlyPublicKey, DefiniteDescriptorKey, ()> for TranslateXOnlyPk {
2098+
fn pk(&mut self, pk: &XOnlyPublicKey) -> Result<DefiniteDescriptorKey, ()> {
21082099
Ok(DefiniteDescriptorKey::new(DescriptorPublicKey::from(*pk))
21092100
.expect("DescriptorPublicKey from XOnlyPublicKey has no wildcards"))
21102101
}
21112102

2112-
translate_hash_clone!(XOnlyPublicKey, DefiniteDescriptorKey, Self::Error);
2103+
translate_hash_clone!(XOnlyPublicKey, DefiniteDescriptorKey, ());
21132104
}
21142105

21152106
let xonly_converted_descriptor = xonly_pk_descriptor

0 commit comments

Comments
 (0)