@@ -581,10 +581,8 @@ impl Descriptor<DescriptorPublicKey> {
581
581
582
582
translate_hash_clone ! ( DescriptorPublicKey , DescriptorPublicKey , ConversionError ) ;
583
583
}
584
- self . translate_pk ( & mut Derivator ( index) ) . map_err ( |e| {
585
- e. try_into_translator_err ( )
586
- . expect ( "No Context errors while translating" )
587
- } )
584
+ self . translate_pk ( & mut Derivator ( index) )
585
+ . map_err ( |e| e. expect_translator_err ( "No Context errors while translating" ) )
588
586
}
589
587
590
588
#[ deprecated( note = "use at_derivation_index instead" ) ]
@@ -699,8 +697,7 @@ impl Descriptor<DescriptorPublicKey> {
699
697
let descriptor = Descriptor :: < String > :: from_str ( s) ?;
700
698
let descriptor = descriptor. translate_pk ( & mut keymap_pk) . map_err ( |e| {
701
699
Error :: Unexpected (
702
- e. try_into_translator_err ( )
703
- . expect ( "No Outer context errors" )
700
+ e. expect_translator_err ( "No Outer context errors" )
704
701
. to_string ( ) ,
705
702
)
706
703
} ) ?;
@@ -830,10 +827,9 @@ impl Descriptor<DescriptorPublicKey> {
830
827
831
828
for ( i, desc) in descriptors. iter_mut ( ) . enumerate ( ) {
832
829
let mut index_choser = IndexChoser ( i) ;
833
- * desc = desc. translate_pk ( & mut index_choser) . map_err ( |e| {
834
- e. try_into_translator_err ( )
835
- . expect ( "No Context errors possible" )
836
- } ) ?;
830
+ * desc = desc
831
+ . translate_pk ( & mut index_choser)
832
+ . map_err ( |e| e. expect_translator_err ( "No Context errors possible" ) ) ?;
837
833
}
838
834
839
835
Ok ( descriptors)
@@ -886,10 +882,7 @@ impl Descriptor<DefiniteDescriptorKey> {
886
882
let derived = self . translate_pk ( & mut Derivator ( secp) ) ;
887
883
match derived {
888
884
Ok ( derived) => Ok ( derived) ,
889
- Err ( e) => match e. try_into_translator_err ( ) {
890
- Ok ( e) => Err ( e) ,
891
- Err ( _) => unreachable ! ( "No Context errors when deriving keys" ) ,
892
- } ,
885
+ Err ( e) => Err ( e. expect_translator_err ( "No Context errors when deriving keys" ) ) ,
893
886
}
894
887
}
895
888
}
0 commit comments