f use core::ops::Bound

Author: TheBlueMatt

lightning/src/routing/gossip.rs

@@ -41,7 +41,7 @@ use core::{cmp, fmt};
 use sync::{RwLock, RwLockReadGuard};
 use core::sync::atomic::{AtomicUsize, Ordering};
 use sync::Mutex;
-use core::ops::Deref;
+use core::ops::{Bound, Deref};
 use bitcoin::hashes::hex::ToHex;
 
 #[cfg(feature = "std")]
@@ -342,12 +342,10 @@ where C::Target: chain::Access, L::Target: Logger
 
 	fn get_next_node_announcement(&self, starting_point: Option<&PublicKey>) -> Option<NodeAnnouncement> {
 		let nodes = self.network_graph.nodes.read().unwrap();
-		let mut iter = if let Some(pubkey) = starting_point {
-				let mut iter = nodes.range(NodeId::from_pubkey(pubkey)..);
-				iter.next();
-				iter
+		let iter = if let Some(pubkey) = starting_point {
+				nodes.range((Bound::Excluded(NodeId::from_pubkey(pubkey)), Bound::Unbounded))
 			} else {
-				nodes.range::<NodeId, _>(..)
+				nodes.range(..)
 			};
 		for (_, ref node) in iter {
 			if let Some(node_info) = node.announcement_info.as_ref() {