f - ChannelManager::write lockorder cleanup

Author: ViktorTigerstrom

lightning/src/ln/channelmanager.rs

@@ -6641,37 +6641,37 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> Writeable f
 			}
 		}
 
-		let mut htlc_purposes: Vec<events::PaymentPurpose> = Vec::new();
-		{
-			let claimable_htlcs = self.claimable_htlcs.lock().unwrap();
-			(claimable_htlcs.len() as u64).write(writer)?;
-			for (payment_hash, (purpose, previous_hops)) in claimable_htlcs.iter() {
-				payment_hash.write(writer)?;
-				(previous_hops.len() as u64).write(writer)?;
-				for htlc in previous_hops.iter() {
-					htlc.write(writer)?;
-				}
-				htlc_purposes.push(purpose.clone());
+		let per_peer_state = self.per_peer_state.write().unwrap();
+		let pending_inbound_payments = self.pending_inbound_payments.lock().unwrap();
+		let claimable_htlcs = self.claimable_htlcs.lock().unwrap();
+
+		let mut htlc_purposes: Vec<&events::PaymentPurpose> = Vec::new();
+		(claimable_htlcs.len() as u64).write(writer)?;
+		for (payment_hash, (purpose, previous_hops)) in claimable_htlcs.iter() {
+			payment_hash.write(writer)?;
+			(previous_hops.len() as u64).write(writer)?;
+			for htlc in previous_hops.iter() {
+				htlc.write(writer)?;
 			}
+			htlc_purposes.push(purpose);
 		}
 
-		let per_peer_state = self.per_peer_state.write().unwrap();
 		(per_peer_state.len() as u64).write(writer)?;
 		for (peer_pubkey, peer_state_mutex) in per_peer_state.iter() {
 			peer_pubkey.write(writer)?;
 			let peer_state = peer_state_mutex.lock().unwrap();
 			peer_state.latest_features.write(writer)?;
 		}
 
-		let pending_inbound_payments = self.pending_inbound_payments.lock().unwrap();
 		let pending_outbound_payments = self.pending_outbound_payments.lock().unwrap();
 		let events = self.pending_events.lock().unwrap();
+		let background_events = self.pending_background_events.lock().unwrap();
+
 		(events.len() as u64).write(writer)?;
 		for event in events.iter() {
 			event.write(writer)?;
 		}
 
-		let background_events = self.pending_background_events.lock().unwrap();
 		(background_events.len() as u64).write(writer)?;
 		for event in background_events.iter() {
 			match event {