Change out hardcoded 128

Author: sourabhmarathe

lightning/src/ln/channelmanager.rs

@@ -3769,8 +3769,9 @@ impl<'a, ChanSigner: ChannelKeys + Readable, M: Deref, T: Deref, K: Deref, F: De
 			}
 		}
 
+		const MAX_ALLOC_SIZE: u64 = 1024 * 64;
 		let forward_htlcs_count: u64 = Readable::read(reader)?;
-		let mut forward_htlcs = HashMap::with_capacity(cmp::min(forward_htlcs_count as usize, 128));
+		let mut forward_htlcs = HashMap::with_capacity(cmp::min(forward_htlcs_count as usize, (MAX_ALLOC_SIZE as usize)/mem::size_of::<HTLCForwardInfo>()));
 		for _ in 0..forward_htlcs_count {
 			let short_channel_id = Readable::read(reader)?;
 			let pending_forwards_count: u64 = Readable::read(reader)?;
@@ -3782,7 +3783,7 @@ impl<'a, ChanSigner: ChannelKeys + Readable, M: Deref, T: Deref, K: Deref, F: De
 		}
 
 		let claimable_htlcs_count: u64 = Readable::read(reader)?;
-		let mut claimable_htlcs = HashMap::with_capacity(cmp::min(claimable_htlcs_count as usize, 128));
+		let mut claimable_htlcs = HashMap::with_capacity(cmp::min(claimable_htlcs_count as usize, (MAX_ALLOC_SIZE as usize)/mem::size_of::<ClaimableHTLC>()));
 		for _ in 0..claimable_htlcs_count {
 			let payment_hash = Readable::read(reader)?;
 			let previous_hops_len: u64 = Readable::read(reader)?;
@@ -3794,7 +3795,7 @@ impl<'a, ChanSigner: ChannelKeys + Readable, M: Deref, T: Deref, K: Deref, F: De
 		}
 
 		let peer_count: u64 = Readable::read(reader)?;
-		let mut per_peer_state = HashMap::with_capacity(cmp::min(peer_count as usize, 128));
+		let mut per_peer_state = HashMap::with_capacity(cmp::min(peer_count as usize, (MAX_ALLOC_SIZE as usize)/mem::size_of::<PeerState>()));
 		for _ in 0..peer_count {
 			let peer_pubkey = Readable::read(reader)?;
 			let peer_state = PeerState {
@@ -3803,7 +3804,6 @@ impl<'a, ChanSigner: ChannelKeys + Readable, M: Deref, T: Deref, K: Deref, F: De
 			per_peer_state.insert(peer_pubkey, Mutex::new(peer_state));
 		}
 
-		const MAX_ALLOC_SIZE: u64 = 1024 * 64;
 		let event_count: u64 = Readable::read(reader)?;
 		let mut pending_events_read: Vec<events::Event> = Vec::with_capacity(cmp::min(event_count as usize, (MAX_ALLOC_SIZE as usize)/mem::size_of::<events::Event>()));
 		for _ in 0..event_count {