From df9367adaffd1385034e123c37cf971d7e102105 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sun, 1 Apr 2018 17:20:59 -0400 Subject: [PATCH] Rename ErrorMessage --- src/ln/channelmanager.rs | 2 +- src/ln/msgs.rs | 4 ++-- src/ln/peer_channel_encryptor.rs | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ln/channelmanager.rs b/src/ln/channelmanager.rs index 43e0d59f..6d631435 100644 --- a/src/ln/channelmanager.rs +++ b/src/ln/channelmanager.rs @@ -1121,7 +1121,7 @@ impl ChannelMessageHandler for ChannelManager { ($msg: expr, $err_code: expr, $data: expr) => { return Err(msgs::HandleError { err: $msg, - msg: Some(msgs::ErrorMessage::UpdateFailHTLC { + msg: Some(msgs::ErrorAction::UpdateFailHTLC { msg: msgs::UpdateFailHTLC { channel_id: msg.channel_id, htlc_id: msg.htlc_id, diff --git a/src/ln/msgs.rs b/src/ln/msgs.rs index 312fea20..0d5e4ec7 100644 --- a/src/ln/msgs.rs +++ b/src/ln/msgs.rs @@ -342,7 +342,7 @@ pub struct ChannelUpdate { } /// Used to put an error message in a HandleError -pub enum ErrorMessage { +pub enum ErrorAction { UpdateFailHTLC { msg: UpdateFailHTLC }, @@ -351,7 +351,7 @@ pub enum ErrorMessage { pub struct HandleError { //TODO: rename me pub err: &'static str, - pub msg: Option, //TODO: Move into an Action enum and require it! + pub msg: Option, //TODO: Make this required and rename it } /// A trait to describe an object which can receive channel messages. Messages MAY be called in diff --git a/src/ln/peer_channel_encryptor.rs b/src/ln/peer_channel_encryptor.rs index 67b0a14c..3ec6241f 100644 --- a/src/ln/peer_channel_encryptor.rs +++ b/src/ln/peer_channel_encryptor.rs @@ -147,7 +147,7 @@ impl PeerChannelEncryptor { let mut chacha = ChaCha20Poly1305RFC::new(key, &nonce, h); if !chacha.decrypt(&cyphertext[0..cyphertext.len() - 16], res, &cyphertext[cyphertext.len() - 16..]) { - return Err(HandleError{err: "Bad MAC", msg: Some(msgs::ErrorMessage::DisconnectPeer{})}); + return Err(HandleError{err: "Bad MAC", msg: Some(msgs::ErrorAction::DisconnectPeer{})}); } Ok(()) } @@ -195,11 +195,11 @@ impl PeerChannelEncryptor { assert_eq!(act.len(), 50); if act[0] != 0 { - return Err(HandleError{err: "Unknown handshake version number", msg: Some(msgs::ErrorMessage::DisconnectPeer{})}); + return Err(HandleError{err: "Unknown handshake version number", msg: Some(msgs::ErrorAction::DisconnectPeer{})}); } let their_pub = match PublicKey::from_slice(secp_ctx, &act[1..34]) { - Err(_) => return Err(HandleError{err: "Invalid public key", msg: Some(msgs::ErrorMessage::DisconnectPeer{})}), + Err(_) => return Err(HandleError{err: "Invalid public key", msg: Some(msgs::ErrorAction::DisconnectPeer{})}), Ok(key) => key, }; @@ -349,14 +349,14 @@ impl PeerChannelEncryptor { panic!("Requested act at wrong step"); } if act_three[0] != 0 { - return Err(HandleError{err: "Unknown handshake version number", msg: Some(msgs::ErrorMessage::DisconnectPeer{})}); + return Err(HandleError{err: "Unknown handshake version number", msg: Some(msgs::ErrorAction::DisconnectPeer{})}); } let mut their_node_id = [0; 33]; PeerChannelEncryptor::decrypt_with_ad(&mut their_node_id, 1, &temp_k2.unwrap(), &bidirectional_state.h, &act_three[1..50])?; self.their_node_id = Some(match PublicKey::from_slice(&self.secp_ctx, &their_node_id) { Ok(key) => key, - Err(_) => return Err(HandleError{err: "Bad node_id from peer", msg: Some(msgs::ErrorMessage::DisconnectPeer{})}), + Err(_) => return Err(HandleError{err: "Bad node_id from peer", msg: Some(msgs::ErrorAction::DisconnectPeer{})}), }); let mut sha = Sha256::new(); -- 2.30.2