update pallet_mmr config in beefy mock and cargo fmt

paritytech · Apr 11, 2024 · bb88cde · bb88cde
1 parent 2fb5e4c
commit bb88cde
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/substrate/frame/beefy-mmr/src/mock.rs b/substrate/frame/beefy-mmr/src/mock.rs
@@ -90,6 +90,8 @@ impl pallet_mmr::Config for Test {
 
 	type OnNewRoot = pallet_beefy_mmr::DepositBeefyDigest<Test>;
 
+	type BlockHashProvider = pallet_mmr::DefaultBlockHashProvider<Test>;
+
 	type WeightInfo = ();
 }
 

diff --git a/substrate/frame/merkle-mountain-range/src/lib.rs b/substrate/frame/merkle-mountain-range/src/lib.rs
@@ -104,16 +104,18 @@ impl<T: frame_system::Config> LeafDataProvider for ParentNumberAndHash<T> {
 }
 
 /// Block hash provider for a given block number.
-pub trait BlockHashProvider<BlockNumber, BlockHash>{
+pub trait BlockHashProvider<BlockNumber, BlockHash> {
 	fn block_hash_for(block_number: BlockNumber) -> BlockHash;
 }
 
 /// Default implementation of BlockHashProvider using frame_system.
-pub struct DefaultBlockHashProvider<T: frame_system::Config>{
+pub struct DefaultBlockHashProvider<T: frame_system::Config> {
 	_phantom: sp_std::marker::PhantomData<T>,
 }
 
-impl<T: frame_system::Config> BlockHashProvider<BlockNumberFor<T>, T::Hash> for DefaultBlockHashProvider<T> {
+impl<T: frame_system::Config> BlockHashProvider<BlockNumberFor<T>, T::Hash>
+	for DefaultBlockHashProvider<T>
+{
 	fn block_hash_for(block_number: BlockNumberFor<T>) -> T::Hash {
 		frame_system::Pallet::<T>::block_hash(block_number)
 	}
@@ -194,7 +196,10 @@ pub mod pallet {
 		type OnNewRoot: primitives::OnNewRoot<HashOf<Self, I>>;
 
 		/// Block hash provider for a given block number.
-		type BlockHashProvider: BlockHashProvider<BlockNumberFor<Self>, <Self as frame_system::Config>::Hash>;
+		type BlockHashProvider: BlockHashProvider<
+			BlockNumberFor<Self>,
+			<Self as frame_system::Config>::Hash,
+		>;
 
 		/// Weights for this pallet.
 		type WeightInfo: WeightInfo;

diff --git a/substrate/frame/merkle-mountain-range/src/mmr/storage.rs b/substrate/frame/merkle-mountain-range/src/mmr/storage.rs
@@ -29,7 +29,7 @@ use sp_std::prelude::*;
 use crate::{
 	mmr::{Node, NodeOf},
 	primitives::{self, NodeIndex},
-	Config, Nodes, NumberOfLeaves, Pallet, BlockHashProvider
+	BlockHashProvider, Config, Nodes, NumberOfLeaves, Pallet,
 };
 
 /// A marker type for runtime-specific storage implementation.