f rename new map

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -452,7 +452,7 @@ pub struct ChannelManager<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref,
 	/// after reloading from disk while replaying blocks against ChannelMonitors.
 	///
 	/// Locked *after* channel_state.
-	outbound_pending_payments: Mutex<HashSet<[u8; 32]>>,
+	pending_outbound_payments: Mutex<HashSet<[u8; 32]>>,
 
 	our_network_key: SecretKey,
 	our_network_pubkey: PublicKey,
@@ -925,7 +925,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 				pending_msg_events: Vec::new(),
 			}),
 			pending_inbound_payments: Mutex::new(HashMap::new()),
-			outbound_pending_payments: Mutex::new(HashSet::new()),
+			pending_outbound_payments: Mutex::new(HashSet::new()),
 
 			our_network_key: keys_manager.get_node_secret(),
 			our_network_pubkey: PublicKey::from_secret_key(&secp_ctx, &keys_manager.get_node_secret()),
@@ -1492,7 +1492,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 		let onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, prng_seed, payment_hash);
 
 		let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
-		assert!(self.outbound_pending_payments.lock().unwrap().insert(session_priv_bytes));
+		assert!(self.pending_outbound_payments.lock().unwrap().insert(session_priv_bytes));
 
 		let err: Result<(), _> = loop {
 			let mut channel_lock = self.channel_state.lock().unwrap();
@@ -2247,7 +2247,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 					if {
 						let mut session_priv_bytes = [0; 32];
 						session_priv_bytes.copy_from_slice(&session_priv[..]);
-						self.outbound_pending_payments.lock().unwrap().remove(&session_priv_bytes)
+						self.pending_outbound_payments.lock().unwrap().remove(&session_priv_bytes)
 					} {
 						self.pending_events.lock().unwrap().push(
 							events::Event::PaymentFailed {
@@ -2285,7 +2285,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 				if {
 					let mut session_priv_bytes = [0; 32];
 					session_priv_bytes.copy_from_slice(&session_priv[..]);
-					!self.outbound_pending_payments.lock().unwrap().remove(&session_priv_bytes)
+					!self.pending_outbound_payments.lock().unwrap().remove(&session_priv_bytes)
 				} {
 					return;
 				}
@@ -2522,7 +2522,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 				if {
 					let mut session_priv_bytes = [0; 32];
 					session_priv_bytes.copy_from_slice(&session_priv[..]);
-					self.outbound_pending_payments.lock().unwrap().remove(&session_priv_bytes)
+					self.pending_outbound_payments.lock().unwrap().remove(&session_priv_bytes)
 				} {
 					let mut pending_events = self.pending_events.lock().unwrap();
 					pending_events.push(events::Event::PaymentSent {
@@ -4504,9 +4504,9 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> Writeable f
 			pending_payment.write(writer)?;
 		}
 
-		let outbound_pending_payments = self.outbound_pending_payments.lock().unwrap();
-		(outbound_pending_payments.len() as u64).write(writer)?;
-		for session_priv in outbound_pending_payments.iter() {
+		let pending_outbound_payments = self.pending_outbound_payments.lock().unwrap();
+		(pending_outbound_payments.len() as u64).write(writer)?;
+		for session_priv in pending_outbound_payments.iter() {
 			session_priv.write(writer)?;
 		}
 
@@ -4749,10 +4749,10 @@ impl<'a, Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 			}
 		}
 
-		let outbound_pending_payments_count: u64 = Readable::read(reader)?;
-		let mut outbound_pending_payments: HashSet<[u8; 32]> = HashSet::with_capacity(cmp::min(outbound_pending_payments_count as usize, MAX_ALLOC_SIZE/32));
-		for _ in 0..outbound_pending_payments_count {
-			if !outbound_pending_payments.insert(Readable::read(reader)?) {
+		let pending_outbound_payments_count: u64 = Readable::read(reader)?;
+		let mut pending_outbound_payments: HashSet<[u8; 32]> = HashSet::with_capacity(cmp::min(pending_outbound_payments_count as usize, MAX_ALLOC_SIZE/32));
+		for _ in 0..pending_outbound_payments_count {
+			if !pending_outbound_payments.insert(Readable::read(reader)?) {
 				return Err(DecodeError::InvalidValue);
 			}
 		}
@@ -4776,7 +4776,7 @@ impl<'a, Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 				pending_msg_events: Vec::new(),
 			}),
 			pending_inbound_payments: Mutex::new(pending_inbound_payments),
-			outbound_pending_payments: Mutex::new(outbound_pending_payments),
+			pending_outbound_payments: Mutex::new(pending_outbound_payments),
 
 			our_network_key: args.keys_manager.get_node_secret(),
 			our_network_pubkey: PublicKey::from_secret_key(&secp_ctx, &args.keys_manager.get_node_secret()),