@@ -2073,19 +2073,13 @@ pk(03f28773c2d975288bc7d1d205c3748651b075fbc6610e58cddeeddf8f19405aa8))";
2073
2073
2074
2074
struct TranslateFullPk ;
2075
2075
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 , ( ) > {
2084
2078
Ok ( DefiniteDescriptorKey :: new ( DescriptorPublicKey :: from ( * pk) )
2085
2079
. expect ( "DescriptorPublicKey from PublicKey has no wildcards" ) )
2086
2080
}
2087
2081
2088
- translate_hash_clone ! ( bitcoin:: PublicKey , DefiniteDescriptorKey , Self :: Error ) ;
2082
+ translate_hash_clone ! ( bitcoin:: PublicKey , DefiniteDescriptorKey , ( ) ) ;
2089
2083
}
2090
2084
2091
2085
let converted_descriptor = full_pk_descriptor
@@ -2100,16 +2094,13 @@ pk(03f28773c2d975288bc7d1d205c3748651b075fbc6610e58cddeeddf8f19405aa8))";
2100
2094
2101
2095
struct TranslateXOnlyPk ;
2102
2096
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 , ( ) > {
2108
2099
Ok ( DefiniteDescriptorKey :: new ( DescriptorPublicKey :: from ( * pk) )
2109
2100
. expect ( "DescriptorPublicKey from XOnlyPublicKey has no wildcards" ) )
2110
2101
}
2111
2102
2112
- translate_hash_clone ! ( XOnlyPublicKey , DefiniteDescriptorKey , Self :: Error ) ;
2103
+ translate_hash_clone ! ( XOnlyPublicKey , DefiniteDescriptorKey , ( ) ) ;
2113
2104
}
2114
2105
2115
2106
let xonly_converted_descriptor = xonly_pk_descriptor
0 commit comments