fixup: reorganize utils/mod, add debug_assert to bounded_map, extract peer cleanup to function

Author: martinsaposnic

lightning-liquidity/src/lsps5/client.rs

@@ -352,6 +352,12 @@ where
 		};
 		self.with_peer_state(*counterparty_node_id, handle_response);
 
+		self.check_and_remove_empty_peer_state(counterparty_node_id);
+
+		result
+	}
+
+	fn check_and_remove_empty_peer_state(&self, counterparty_node_id: &PublicKey) {
 		let mut outer_state_lock = self.per_peer_state.write().unwrap();
 		let should_remove =
 			if let Some(peer_state_mutex) = outer_state_lock.get(counterparty_node_id) {
@@ -364,7 +370,6 @@ where
 		if should_remove {
 			outer_state_lock.remove(counterparty_node_id);
 		}
-		result
 	}
 }
 

lightning-liquidity/src/utils/bounded_map.rs

@@ -31,13 +31,14 @@ where
 		}
 
 		self.map.insert(key.clone(), value);
-		self.order.push_back(key.clone());
+		self.order.push_back(key);
 
 		if self.order.len() > self.cap {
 			if let Some(oldest) = self.order.pop_front() {
 				self.map.remove(&oldest);
 			}
 		}
+		self.check_invariants();
 	}
 
 	/// Remove a key (if present) and return its value.
@@ -46,9 +47,16 @@ where
 		if val.is_some() {
 			self.order.retain(|k| k != key);
 		}
+		self.check_invariants();
 		val
 	}
 
+	fn check_invariants(&self) {
+		debug_assert!(self.map.len() <= self.cap);
+		debug_assert!(self.order.len() <= self.cap);
+		debug_assert!(self.map.len() == self.order.len());
+	}
+
 	/// Get a reference to the value associated with `key`.
 	#[cfg(test)]
 	pub(crate) fn get(&self, key: &K) -> Option<&V> {

lightning-liquidity/src/utils/mod.rs

@@ -7,6 +7,10 @@ use lightning::sign::EntropySource;
 
 use crate::lsps0::ser::LSPSRequestId;
 
+pub(crate) mod bounded_map;
+
+pub mod time;
+
 /// Converts a human-readable string representation of a short channel ID (SCID)
 pub fn scid_from_human_readable_string(human_readable_scid: &str) -> Result<u64, ()> {
 	let mut parts = human_readable_scid.split('x');
@@ -56,6 +60,3 @@ mod tests {
 		assert_eq!(vout_from_scid(scid), vout);
 	}
 }
-
-pub(crate) mod bounded_map;
-pub mod time;