X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fonion_message%2Fpacket.rs;h=20b1fb0b82fdf5cf0c0b16096f524110d20ba6da;hb=aa916bb594fbc77c819e82eb2fc269a307376a01;hp=4ab53735ed6f8c9fc132d13dd80fc61628319f35;hpb=414d8e1c4a9fcc8941c7af122a5da977e6c8720f;p=rust-lightning

diff --git a/lightning/src/onion_message/packet.rs b/lightning/src/onion_message/packet.rs
index 4ab53735..20b1fb0b 100644
--- a/lightning/src/onion_message/packet.rs
+++ b/lightning/src/onion_message/packet.rs
@@ -27,7 +27,7 @@ use prelude::*;
 pub(super) const SMALL_PACKET_HOP_DATA_LEN: usize = 1300;
 pub(super) const BIG_PACKET_HOP_DATA_LEN: usize = 32768;
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub(crate) struct Packet {
 	pub(super) version: u8,
 	pub(super) public_key: PublicKey,
@@ -74,7 +74,7 @@ impl LengthReadable for Packet {
 		while read_idx < hop_data_len {
 			let mut read_buffer = [0; READ_BUFFER_SIZE];
 			let read_amt = cmp::min(hop_data_len - read_idx, READ_BUFFER_SIZE);
-			r.read_exact(&mut read_buffer[..read_amt]);
+			r.read_exact(&mut read_buffer[..read_amt])?;
 			hop_data.extend_from_slice(&read_buffer[..read_amt]);
 			read_idx += read_amt;
 		}
@@ -170,7 +170,7 @@ impl Writeable for (Payload, [u8; 32]) {
 
 // Uses the provided secret to simultaneously decode and decrypt the control TLVs.
 impl ReadableArgs<SharedSecret> for Payload {
-	fn read<R: Read>(mut r: &mut R, encrypted_tlvs_ss: SharedSecret) -> Result<Self, DecodeError> {
+	fn read<R: Read>(r: &mut R, encrypted_tlvs_ss: SharedSecret) -> Result<Self, DecodeError> {
 		let v: BigSize = Readable::read(r)?;
 		let mut rd = FixedLengthReader::new(r, v.0);
 		let mut reply_path: Option<BlindedRoute> = None;