f copy, not loop

lightning/src/routing/gossip.rs

@@ -34,6 +34,7 @@ use util::events::{Event, EventHandler, MessageSendEvent, MessageSendEventsProvi
 use util::scid_utils::{block_from_scid, scid_from_parts, MAX_SCID_BLOCK};
 
 use io;
+use io_extras::{copy, sink};
 use prelude::*;
 use alloc::collections::{BTreeMap, btree_map::Entry as BtreeEntry};
 use core::{cmp, fmt};
@@ -1108,13 +1109,13 @@ struct NodeAnnouncementInfoDeserWrapper(NodeAnnouncementInfo);
 
 impl MaybeReadable for NodeAnnouncementInfoDeserWrapper {
 	fn read<R: io::Read>(reader: &mut R) -> Result<Option<Self>, DecodeError> {
-		loop {
-			match ::util::ser::Readable::read(reader) {
-				Ok(node_announcement_info) => return Ok(Some(Self(node_announcement_info))),
-				Err(DecodeError::ShortRead) => return Ok(None),
-				Err(_) => {},
-			};
-		}
+		match ::util::ser::Readable::read(reader) {
+			Ok(node_announcement_info) => return Ok(Some(Self(node_announcement_info))),
+			Err(_) => {
+				copy(reader, &mut sink()).unwrap();
+				return Ok(None)
+			},
+		};
 	}
 }