zecfoundation
/
libbolt
mirror of https://github.com/ZcashFoundation/libbolt.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

More updates to error handling

This commit is contained in:
J. Ayo Akinyele 2019-08-08 02:57:15 -07:00
parent 180504e7ae
commit ede04922be
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/channels.rs
View File

@ -426,7 +426,7 @@ impl<E: Engine> CustomerWallet<E> {
return true;
}
pub fn generate_revoke_token(&mut self, channel: &ChannelState<E>, close_token: &Signature<E>) -> (RevokedMessage, secp256k1::Signature) {
pub fn generate_revoke_token(&mut self, channel: &ChannelState<E>, close_token: &Signature<E>) -> ResultBoltSig<(RevokedMessage, secp256k1::Signature)> {
if self.verify_close_token(channel, close_token) {
let old_wallet = self.old_kp.unwrap();
// proceed with generating the close token
@ -436,10 +436,10 @@ impl<E: Engine> CustomerWallet<E> {
// msg = "revoked"|| old wsk (for old wallet)
let revoke_token = secp.sign(&revoke_msg, &old_wallet.wsk);
return (rm, revoke_token);
return Ok((rm, revoke_token));
}
panic!("generate_revoke_token - could not verify the close token.");
Err(BoltError::new("generate_revoke_token - could not verify the close token."))
}
}
@ -655,7 +655,7 @@ mod tests {
//println!("3 - verified the close token!");
// invalidate the previous state only if close token checks out
let (revoke_msg, revoke_sig) = cust_wallet.generate_revoke_token(&channel, &new_close_token);
let (revoke_msg, revoke_sig) = cust_wallet.generate_revoke_token(&channel, &new_close_token).unwrap();
//println!("4 - Generated revoke token successfully.");
//println!("5 - Revoke token => {}", revoke_token);

2
src/lib.rs
View File

@ -432,7 +432,7 @@ pub mod bidirectional {
// let's update the old wallet
assert!(old_cust_wallet.update(new_cust_wallet));
// generate the token after verifying that the close token is valid
let (message, signature) = old_cust_wallet.generate_revoke_token(channel_state, new_close_token);
let (message, signature) = old_cust_wallet.generate_revoke_token(channel_state, new_close_token).unwrap();
// return the revoke token (msg + sig pair)
return RevokeToken { message, signature };