From 5839f442901e6e48c02da20a784a999be75e4a8c Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Tue, 25 Oct 2022 02:45:20 -0400 Subject: [PATCH] Clean up lock acquisition --- substrate/consensus/src/tendermint.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/substrate/consensus/src/tendermint.rs b/substrate/consensus/src/tendermint.rs index ec6a8d6c..077be1a5 100644 --- a/substrate/consensus/src/tendermint.rs +++ b/substrate/consensus/src/tendermint.rs @@ -351,8 +351,11 @@ where let (header, body) = block.clone().deconstruct(); let parent = *header.parent_hash(); let number = *header.number(); + + let mut queue_write = self.queue.write().await; *self.importing_block.write().unwrap() = Some(hash); - self.queue.write().await.as_mut().unwrap().import_blocks( + + queue_write.as_mut().unwrap().import_blocks( // We do not want this block, which hasn't been confirmed, to be broadcast over the net // Substrate will generate notifications unless it's Genesis, which this isn't, InitialSync, // which changes telemtry behavior, or File, which is... close enough @@ -372,7 +375,7 @@ where }], ); - if !ImportFuture::new(hash, self.queue.write().await.as_mut().unwrap()).await { + if !ImportFuture::new(hash, queue_write.as_mut().unwrap()).await { todo!() }