From 2411660bd87579c0c88fdae53eeb7d7f8edb782f Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Fri, 11 Nov 2022 03:49:02 -0500 Subject: [PATCH] Update to the latest substrate --- substrate/tendermint/client/src/authority/mod.rs | 4 ++-- substrate/tendermint/client/src/block_import.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/substrate/tendermint/client/src/authority/mod.rs b/substrate/tendermint/client/src/authority/mod.rs index 964a8d2e..2d579e9c 100644 --- a/substrate/tendermint/client/src/authority/mod.rs +++ b/substrate/tendermint/client/src/authority/mod.rs @@ -102,7 +102,7 @@ impl TendermintAuthority { &mut self .import .client - .justifications(&BlockId::Hash(info.finalized_hash)) + .justifications(info.finalized_hash) .unwrap() .map(|justifications| justifications.get(CONSENSUS_ID).cloned().unwrap()) .unwrap_or_default() @@ -350,7 +350,7 @@ impl Network for TendermintAuthority { self .import .client - .finalize_block(BlockId::Hash(hash), Some(justification), true) + .finalize_block(hash, Some(justification), true) .map_err(|_| Error::InvalidJustification) .unwrap(); diff --git a/substrate/tendermint/client/src/block_import.rs b/substrate/tendermint/client/src/block_import.rs index 7b4ddf27..dc285e66 100644 --- a/substrate/tendermint/client/src/block_import.rs +++ b/substrate/tendermint/client/src/block_import.rs @@ -22,7 +22,7 @@ impl TendermintImport { // This can be triggered if the validators add a block, without justifications, yet the p2p // process then broadcasts it with its justifications if (self.client.status(id).unwrap() == BlockStatus::InChain) && - self.client.justifications(&id).unwrap().is_some() + self.client.justifications(hash).unwrap().is_some() { return true; }