f drop pairs

Author: TheBlueMatt

lightning/src/util/persist.rs

@@ -1189,14 +1189,12 @@ mod tests {
 	}
 
 	// Exercise the `MonitorUpdatingPersister` with real channels and payments.
-	fn do_persister_with_real_monitors(persisters_max_pending_updates: (u64, u64)) {
-		let persister_0_max_pending_updates = persisters_max_pending_updates.0;
-		let persister_1_max_pending_updates = persisters_max_pending_updates.1;
+	fn do_persister_with_real_monitors(max_pending_updates_0: u64, max_pending_updates_1: u64) {
 		let chanmon_cfgs = create_chanmon_cfgs(4);
 		let persister_0 = MonitorUpdatingPersister {
 			kv_store: &TestStore::new(false),
 			logger: &TestLogger::new(),
-			maximum_pending_updates: persister_0_max_pending_updates,
+			maximum_pending_updates: max_pending_updates_0,
 			entropy_source: &chanmon_cfgs[0].keys_manager,
 			signer_provider: &chanmon_cfgs[0].keys_manager,
 			broadcaster: &chanmon_cfgs[0].tx_broadcaster,
@@ -1205,7 +1203,7 @@ mod tests {
 		let persister_1 = MonitorUpdatingPersister {
 			kv_store: &TestStore::new(false),
 			logger: &TestLogger::new(),
-			maximum_pending_updates: persister_1_max_pending_updates,
+			maximum_pending_updates: max_pending_updates_1,
 			entropy_source: &chanmon_cfgs[1].keys_manager,
 			signer_provider: &chanmon_cfgs[1].keys_manager,
 			broadcaster: &chanmon_cfgs[1].tx_broadcaster,
@@ -1254,10 +1252,10 @@ mod tests {
 					assert_eq!(mon.get_latest_update_id(), $expected_update_id);
 
 					let monitor_name = mon.persistence_key();
-					let expected_updates = if persister_0_max_pending_updates == 0 {
+					let expected_updates = if max_pending_updates_0 == 0 {
 						0
 					} else {
-						mon.get_latest_update_id() % persister_0_max_pending_updates
+						mon.get_latest_update_id() % max_pending_updates_0
 					};
 					let update_list = KVStoreSync::list(
 						&*persister_0.kv_store,
@@ -1272,10 +1270,10 @@ mod tests {
 				for (_, mon) in persisted_chan_data_1.iter() {
 					assert_eq!(mon.get_latest_update_id(), $expected_update_id);
 					let monitor_name = mon.persistence_key();
-					let expected_updates = if persister_1_max_pending_updates == 0 {
+					let expected_updates = if max_pending_updates_1 == 0 {
 						0
 					} else {
-						mon.get_latest_update_id() % persister_1_max_pending_updates
+						mon.get_latest_update_id() % max_pending_updates_1
 					};
 					let update_list = KVStoreSync::list(
 						&*persister_1.kv_store,
@@ -1300,7 +1298,7 @@ mod tests {
 		// Send a few more payments to try all the alignments of max pending updates with
 		// updates for a payment sent and received.
 		let mut sender = 0;
-		for i in 3..=persister_0_max_pending_updates * 2 {
+		for i in 3..=max_pending_updates_0 * 2 {
 			let receiver;
 			if sender == 0 {
 				sender = 1;
@@ -1343,18 +1341,17 @@ mod tests {
 		check_added_monitors!(nodes[1], 1);
 
 		// Make sure everything is persisted as expected after close.
-		// We always send at least two payments, and loop up to persister_0_max_pending_updates *
-		// 2.
+		// We always send at least two payments, and loop up to max_pending_updates_0 * 2.
 		check_persisted_data!(
-			cmp::max(2, persister_0_max_pending_updates * 2) * EXPECTED_UPDATES_PER_PAYMENT + 1
+			cmp::max(2, max_pending_updates_0 * 2) * EXPECTED_UPDATES_PER_PAYMENT + 1
 		);
 	}
 
 	#[test]
 	fn persister_with_real_monitors() {
-		do_persister_with_real_monitors((7, 3));
-		do_persister_with_real_monitors((0, 1));
-		do_persister_with_real_monitors((4, 2));
+		do_persister_with_real_monitors(7, 3);
+		do_persister_with_real_monitors(0, 1);
+		do_persister_with_real_monitors(4, 2);
 	}
 
 	// Test that if the `MonitorUpdatingPersister`'s can't actually write, trying to persist a