Do not violate encapsulation in tests

Author: naumenkogs

lightning/src/routing/network_graph.rs

@@ -765,7 +765,6 @@ mod tests {
 	use secp256k1::Secp256k1;
 
 	use std::sync::Arc;
-	use std::collections::btree_map::Entry as BtreeEntry;
 
 	fn create_net_graph_msg_handler() -> (Secp256k1<All>, PublicKey, NetGraphMsgHandler) {
 		let secp_ctx = Secp256k1::new();
@@ -944,14 +943,16 @@ mod tests {
 			Ok(res) => assert!(res),
 			_ => panic!()
 		};
+
 		{
-			let network = net_graph_msg_handler.network_graph.write().unwrap();
-			match network.channels.get(&unsigned_announcement.short_channel_id) {
+			let network = net_graph_msg_handler.network_graph.read().unwrap();
+			match network.get_channels().get(&unsigned_announcement.short_channel_id) {
 				None => panic!(),
 				Some(_) => ()
 			}
 		}
 
+
 		// If we receive announcement for the same channel (with UTXO lookups disabled),
 		// drop new one on the floor, since we can't see any changes.
 		match net_graph_msg_handler.handle_channel_announcement(&valid_announcement) {
@@ -995,9 +996,10 @@ mod tests {
 			Ok(res) => assert!(res),
 			_ => panic!()
 		};
+
 		{
-			let network = net_graph_msg_handler.network_graph.write().unwrap();
-			match network.channels.get(&unsigned_announcement.short_channel_id) {
+			let network = net_graph_msg_handler.network_graph.read().unwrap();
+			match network.get_channels().get(&unsigned_announcement.short_channel_id) {
 				None => panic!(),
 				Some(_) => ()
 			}
@@ -1027,10 +1029,10 @@ mod tests {
 			_ => panic!()
 		};
 		{
-			let mut network = net_graph_msg_handler.network_graph.write().unwrap();
-			match network.channels.entry(unsigned_announcement.short_channel_id) {
-				BtreeEntry::Occupied(channel_entry) => {
-					assert_eq!(channel_entry.get().features, ChannelFeatures::empty());
+			let network = net_graph_msg_handler.network_graph.read().unwrap();
+			match network.get_channels().get(&unsigned_announcement.short_channel_id) {
+				Some(channel_entry) => {
+					assert_eq!(channel_entry.features, ChannelFeatures::empty());
 				},
 				_ => panic!()
 			}
@@ -1144,8 +1146,8 @@ mod tests {
 		};
 
 		{
-			let network = net_graph_msg_handler.network_graph.write().unwrap();
-			match network.channels.get(&short_channel_id) {
+			let network = net_graph_msg_handler.network_graph.read().unwrap();
+			match network.get_channels().get(&short_channel_id) {
 				None => panic!(),
 				Some(channel_info) => {
 					assert_eq!(channel_info.one_to_two.cltv_expiry_delta, 144);
@@ -1225,8 +1227,8 @@ mod tests {
 		{
 			// There is only local node in the table at the beginning.
 			let network = net_graph_msg_handler.network_graph.read().unwrap();
-			assert_eq!(network.nodes.len(), 1);
-			assert_eq!(network.nodes.contains_key(&our_id), true);
+			assert_eq!(network.get_nodes().len(), 1);
+			assert_eq!(network.get_nodes().contains_key(&our_id), true);
 		}
 
 		{
@@ -1264,10 +1266,10 @@ mod tests {
 
 		net_graph_msg_handler.handle_htlc_fail_channel_update(&channel_close_msg);
 
+		// Non-permanent closing just disables a channel
 		{
-			// Non-permanent closing just disables a channel
-			let network = net_graph_msg_handler.network_graph.write().unwrap();
-			match network.channels.get(&short_channel_id) {
+			let network = net_graph_msg_handler.network_graph.read().unwrap();
+			match network.get_channels().get(&short_channel_id) {
 				None => panic!(),
 				Some(channel_info) => {
 					assert!(!channel_info.one_to_two.enabled);
@@ -1283,16 +1285,15 @@ mod tests {
 
 		net_graph_msg_handler.handle_htlc_fail_channel_update(&channel_close_msg);
 
+		// Permanent closing deletes a channel
 		{
-			// Permanent closing deletes a channel
 			let network = net_graph_msg_handler.network_graph.read().unwrap();
-			assert_eq!(network.channels.len(), 0);
+			assert_eq!(network.get_channels().len(), 0);
 			// Nodes are also deleted because there are no associated channels anymore
 			// Only the local node remains in the table.
-			assert_eq!(network.nodes.len(), 1);
-			assert_eq!(network.nodes.contains_key(&our_id), true);
+			assert_eq!(network.get_nodes().len(), 1);
+			assert_eq!(network.get_nodes().contains_key(&our_id), true);
 		}
-
 		// TODO: Test HTLCFailChannelUpdate::NodeFailure, which is not implemented yet.
 	}
 
@@ -1606,8 +1607,8 @@ mod tests {
 
 		let network = net_graph_msg_handler.network_graph.write().unwrap();
 		let mut w = test_utils::TestVecWriter(Vec::new());
-		assert!(!network.channels.is_empty());
-		assert!(!network.nodes.is_empty());
+		assert!(!network.get_nodes().is_empty());
+		assert!(!network.get_channels().is_empty());
 		network.write(&mut w).unwrap();
 		assert!(<NetworkGraph>::read(&mut ::std::io::Cursor::new(&w.0)).unwrap() == *network);
 	}