appease Rust 1.22 by using byte_utils for endianness functionality

Author: arik-so

lightning/src/ln/peer_handler.rs

@@ -519,7 +519,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 							}
 						}
 
-						if let &PeerState::Handshake(ref mut handshake) = &mut peer.encryptor {
+						if let &mut PeerState::Handshake(ref mut handshake) = &mut peer.encryptor {
 							let (response, conduit, remote_pubkey) = handshake.process_act(&peer.pending_read_buffer, None).unwrap();
 							peer.pending_read_buffer.drain(..); // we read it all
 
@@ -529,7 +529,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 							}
 						}
 
-						if let &PeerState::Connected(ref mut conduit) = &mut peer.encryptor {
+						if let &mut PeerState::Connected(ref mut conduit) = &mut peer.encryptor {
 							let mut messages = conduit.decrypt_message_stream(Some(&peer.pending_read_buffer));
 
 							if messages.len() != 1 {

lightning/src/ln/peers/chacha.rs

@@ -1,8 +1,9 @@
+use util::byte_utils;
 use util::chacha20poly1305rfc::ChaCha20Poly1305RFC;
 
 pub fn encrypt(key: &[u8], nonce: u64, associated_data: &[u8], plaintext: &[u8]) -> Vec<u8> {
 	let mut nonce_bytes = [0; 12];
-	nonce_bytes[4..].copy_from_slice(&nonce.to_le_bytes());
+	nonce_bytes[4..].copy_from_slice(&byte_utils::le64_to_array(nonce));
 
 	let mut chacha = ChaCha20Poly1305RFC::new(key, &nonce_bytes, associated_data);
 	let mut ciphertext = vec![0u8; plaintext.len()];
@@ -17,7 +18,7 @@ pub fn encrypt(key: &[u8], nonce: u64, associated_data: &[u8], plaintext: &[u8])
 
 pub fn decrypt(key: &[u8], nonce: u64, associated_data: &[u8], tagged_ciphertext: &[u8]) -> Result<Vec<u8>, String> {
 	let mut nonce_bytes = [0; 12];
-	nonce_bytes[4..].copy_from_slice(&nonce.to_le_bytes());
+	nonce_bytes[4..].copy_from_slice(&byte_utils::le64_to_array(nonce));
 
 	let length = tagged_ciphertext.len();
 	let ciphertext = &tagged_ciphertext[0..length - 16];

lightning/src/ln/peers/conduit.rs

@@ -1,6 +1,7 @@
 //! Handles all over the wire message encryption and decryption upon handshake completion.
 
 use ln::peers::{chacha, hkdf};
+use util::byte_utils;
 
 /// Returned after a successful handshake to encrypt and decrypt communication with peer nodes
 /// Automatically handles key rotation.
@@ -22,7 +23,7 @@ impl Conduit {
 	/// Encrypt data to be sent to peer
 	pub fn encrypt(&mut self, buffer: &[u8]) -> Vec<u8> {
 		let length = buffer.len() as u16;
-		let length_bytes = length.to_be_bytes();
+		let length_bytes = byte_utils::be16_to_array(length);
 
 		let encrypted_length = chacha::encrypt(&self.sending_key, self.sending_nonce as u64, &[0; 0], &length_bytes);
 		self.increment_sending_nonce();

lightning/src/ln/peers/handshake/acts.rs

@@ -23,7 +23,7 @@ pub enum Act {
 impl Act {
 	/// Convert any act into a byte vector
 	pub fn serialize(&self) -> Vec<u8> {
-		match self {
+		match &self {
 			&Act::One(act) => {
 				act.0.to_vec()
 			}