pallet-merkle-mountain-range: Remove extra Hash type (#14214)

* pallet-merkle-mountain-range: Remove extra `Hash` type

* FMT
This commit is contained in:
Bastian Köcher
2023-05-24 17:14:53 +02:00
committed by GitHub
parent db90f3b622
commit 5bf4ff56bc
7 changed files with 20 additions and 39 deletions
+2 -2
View File
@@ -59,7 +59,7 @@ where
T: pallet_mmr::Config<Hash = sp_consensus_beefy::MmrRootHash>,
T: pallet_beefy::Config,
{
fn on_new_root(root: &<T as pallet_mmr::Config>::Hash) {
fn on_new_root(root: &sp_consensus_beefy::MmrRootHash) {
let digest = sp_runtime::generic::DigestItem::Consensus(
sp_consensus_beefy::BEEFY_ENGINE_ID,
codec::Encode::encode(&sp_consensus_beefy::ConsensusLog::<
@@ -84,7 +84,7 @@ impl Convert<sp_consensus_beefy::crypto::AuthorityId, Vec<u8>> for BeefyEcdsaToE
}
}
type MerkleRootOf<T> = <T as pallet_mmr::Config>::Hash;
type MerkleRootOf<T> = <<T as pallet_mmr::Config>::Hashing as sp_runtime::traits::Hash>::Output;
#[frame_support::pallet]
pub mod pallet {
+2 -4
View File
@@ -25,7 +25,7 @@ use frame_support::{
BasicExternalities,
};
use sp_consensus_beefy::mmr::MmrLeafVersion;
use sp_core::{Hasher, H256};
use sp_core::H256;
use sp_runtime::{
app_crypto::ecdsa::Public,
impl_opaque_keys,
@@ -104,7 +104,7 @@ impl pallet_session::Config for Test {
pub type MmrLeaf = sp_consensus_beefy::mmr::MmrLeaf<
<Test as frame_system::Config>::BlockNumber,
<Test as frame_system::Config>::Hash,
<Test as pallet_mmr::Config>::Hash,
crate::MerkleRootOf<Test>,
Vec<u8>,
>;
@@ -113,8 +113,6 @@ impl pallet_mmr::Config for Test {
type Hashing = Keccak256;
type Hash = <Keccak256 as Hasher>::Out;
type LeafData = BeefyMmr;
type OnNewRoot = pallet_beefy_mmr::DepositBeefyDigest<Test>;