@@ -47,7 +47,7 @@ fn sigrec_decode(sig_rec: Vec<u8>) -> Result<RecoverableSignature, Error> {
47
47
48
48
match RecoveryId :: from_i32 ( rid) {
49
49
Ok ( x) => RecoverableSignature :: from_compact ( rsig, x) ,
50
- Err ( e) => Err ( e)
50
+ Err ( e) => Err ( e) ,
51
51
}
52
52
}
53
53
@@ -63,18 +63,18 @@ pub fn sign(msg: &[u8], sk: &SecretKey) -> String {
63
63
}
64
64
65
65
/// Recovers the PublicKey of the signer of the message given the message and the signature.
66
- pub fn recover_pk ( msg : & [ u8 ] , sig : & str ) -> Result < PublicKey , Error > {
66
+ pub fn recover_pk ( msg : & [ u8 ] , sig : & str ) -> Result < PublicKey , Error > {
67
67
let secp_ctx = Secp256k1 :: verification_only ( ) ;
68
68
let msg_hash = sha256d:: Hash :: hash ( & [ LN_MESSAGE_PREFIX , msg] . concat ( ) ) ;
69
69
70
70
match base32:: Alphabet :: ZBase32 . decode ( & sig) {
71
- Ok ( sig_rec) => {
72
- match sigrec_decode ( sig_rec ) {
73
- Ok ( sig ) => secp_ctx. recover_ecdsa ( & Message :: from_digest ( msg_hash. to_byte_array ( ) ) , & sig) ,
74
- Err ( e ) => Err ( e )
75
- }
71
+ Ok ( sig_rec) => match sigrec_decode ( sig_rec ) {
72
+ Ok ( sig ) => {
73
+ secp_ctx. recover_ecdsa ( & Message :: from_digest ( msg_hash. to_byte_array ( ) ) , & sig)
74
+ } ,
75
+ Err ( e ) => Err ( e ) ,
76
76
} ,
77
- Err ( _) => Err ( Error :: InvalidSignature )
77
+ Err ( _) => Err ( Error :: InvalidSignature ) ,
78
78
}
79
79
}
80
80
@@ -83,16 +83,16 @@ pub fn recover_pk(msg: &[u8], sig: &str) -> Result<PublicKey, Error> {
83
83
pub fn verify ( msg : & [ u8 ] , sig : & str , pk : & PublicKey ) -> bool {
84
84
match recover_pk ( msg, sig) {
85
85
Ok ( x) => x == * pk,
86
- Err ( _) => false
86
+ Err ( _) => false ,
87
87
}
88
88
}
89
89
90
90
#[ cfg( test) ]
91
91
mod test {
92
- use core:: str:: FromStr ;
93
- use crate :: util:: message_signing:: { sign, recover_pk, verify} ;
92
+ use crate :: util:: message_signing:: { recover_pk, sign, verify} ;
94
93
use bitcoin:: secp256k1:: constants:: ONE ;
95
- use bitcoin:: secp256k1:: { PublicKey , SecretKey , Secp256k1 } ;
94
+ use bitcoin:: secp256k1:: { PublicKey , Secp256k1 , SecretKey } ;
95
+ use core:: str:: FromStr ;
96
96
97
97
#[ test]
98
98
fn test_sign ( ) {
@@ -148,4 +148,3 @@ mod test {
148
148
}
149
149
}
150
150
}
151
-
0 commit comments