Fix double-locking in channelmanager

TheBlueMatt · TheBlueMatt · commit 93f47f542183 · 2018-03-25T17:02:28.000-04:00
diff --git a/src/ln/channelmanager.rs b/src/ln/channelmanager.rs
@@ -772,6 +772,7 @@ impl ChannelManager {
 				if from_user {
 					panic!("Called claim_funds with a preimage for an outgoing payment. There is nothing we can do with this, and something is seriously wrong if you knew this...");
 				}
+				mem::drop(channel_state);
 				let mut pending_events = self.pending_events.lock().unwrap();
 				pending_events.push(events::Event::PaymentSent {
 					payment_preimage
@@ -795,6 +796,7 @@ impl ChannelManager {
 					}
 				};
 
+				mem::drop(channel_state);
 				let mut pending_events = self.pending_events.lock().unwrap();
 				pending_events.push(events::Event::SendFulfillHTLC {
 					node_id: node_id,

Original file line number	Diff line number	Diff line change
`@@ -772,6 +772,7 @@ impl ChannelManager {`
`772`	`772`	`if from_user {`
`773`	`773`	`panic!("Called claim_funds with a preimage for an outgoing payment. There is nothing we can do with this, and something is seriously wrong if you knew this...");`
`774`	`774`	`}`
	`775`	`+ mem::drop(channel_state);`
`775`	`776`	`let mut pending_events = self.pending_events.lock().unwrap();`
`776`	`777`	`pending_events.push(events::Event::PaymentSent {`
`777`	`778`	`payment_preimage`
`@@ -795,6 +796,7 @@ impl ChannelManager {`
`795`	`796`	`}`
`796`	`797`	`};`
`797`	`798`
	`799`	`+ mem::drop(channel_state);`
`798`	`800`	`let mut pending_events = self.pending_events.lock().unwrap();`
`799`	`801`	`pending_events.push(events::Event::SendFulfillHTLC {`
`800`	`802`	`node_id: node_id,`