Fix capacity given to per_peer_state dict

sourabhmarathe · sourabhmarathe · commit 4f410d5aec34 · 2020-05-14T17:02:40.000-04:00
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
@@ -3786,7 +3786,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, MAX_ALLOC_SIZE/mem::size_of::<RwLock<HashMap<PublicKey, Mutex<PeerState>>>>()));
+		let mut per_peer_state = HashMap::with_capacity(cmp::min(peer_count as usize, MAX_ALLOC_SIZE/mem::size_of::<(PublicKey, Mutex<PeerState>)>()));
 		for _ in 0..peer_count {
 			let peer_pubkey = Readable::read(reader)?;
 			let peer_state = PeerState {

Original file line number	Diff line number	Diff line change
`@@ -3786,7 +3786,7 @@ impl<'a, ChanSigner: ChannelKeys + Readable, M: Deref, T: Deref, K: Deref, F: De`
`3786`	`3786`	`}`
`3787`	`3787`
`3788`	`3788`	`let peer_count: u64 = Readable::read(reader)?;`
`3789`		`- let mut per_peer_state = HashMap::with_capacity(cmp::min(peer_count as usize, MAX_ALLOC_SIZE/mem::size_of::<RwLock<HashMap<PublicKey, Mutex<PeerState>>>>()));`
	`3789`	`+ let mut per_peer_state = HashMap::with_capacity(cmp::min(peer_count as usize, MAX_ALLOC_SIZE/mem::size_of::<(PublicKey, Mutex<PeerState>)>()));`
`3790`	`3790`	`for _ in 0..peer_count {`
`3791`	`3791`	`let peer_pubkey = Readable::read(reader)?;`
`3792`	`3792`	`let peer_state = PeerState {`