Fixes node-template

bin/node/runtime/src/lib.rs

@@ -1861,10 +1861,7 @@ impl pallet_statement::Config for Runtime {
 }
 
 construct_runtime!(
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = node_primitives::Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: frame_system,
 		Utility: pallet_utility,

client/api/src/backend.rs

@@ -25,7 +25,7 @@ use parking_lot::RwLock;
 use sp_consensus::BlockOrigin;
 use sp_core::offchain::OffchainStorage;
 use sp_runtime::{
-	traits::{Block as BlockT, HashFor, NumberFor},
+	traits::{Block as BlockT, HashFor, HeaderProvider, NumberFor},
 	Justification, Justifications, StateVersion, Storage,
 };
 use sp_state_machine::{

client/api/src/client.rs

@@ -22,7 +22,7 @@ use sp_consensus::BlockOrigin;
 use sp_core::storage::StorageKey;
 use sp_runtime::{
 	generic::SignedBlock,
-	traits::{Block as BlockT, NumberFor},
+	traits::{Block as BlockT, HeaderProvider, NumberFor},
 	Justifications,
 };
 use std::{collections::HashSet, fmt, sync::Arc};

client/api/src/in_mem.rs

@@ -25,7 +25,7 @@ use sp_core::{
 };
 use sp_runtime::{
 	generic::BlockId,
-	traits::{Block as BlockT, HashFor, Header as HeaderT, NumberFor, Zero},
+	traits::{Block as BlockT, HashFor, Header as HeaderT, HeaderProvider, NumberFor, Zero},
 	Justification, Justifications, StateVersion, Storage,
 };
 use sp_state_machine::{
@@ -155,7 +155,7 @@ impl<Block: BlockT> Blockchain<Block> {
 	pub fn insert(
 		&self,
 		hash: Block::Hash,
-		header: <Block as BlockT>::Header,
+		header: <Block as sp_runtime::traits::HeaderProvider>::Header,
 		justifications: Option<Justifications>,
 		body: Option<Vec<<Block as BlockT>::Extrinsic>>,
 		new_state: NewBlockState,
@@ -225,7 +225,7 @@ impl<Block: BlockT> Blockchain<Block> {
 		self.apply_head(&header)
 	}
 
-	fn apply_head(&self, header: &<Block as BlockT>::Header) -> sp_blockchain::Result<()> {
+	fn apply_head(&self, header: &<Block as sp_runtime::traits::HeaderProvider>::Header) -> sp_blockchain::Result<()> {
 		let hash = header.hash();
 		let number = header.number();
 
@@ -331,7 +331,7 @@ impl<Block: BlockT> HeaderBackend<Block> for Blockchain<Block> {
 	fn header(
 		&self,
 		hash: Block::Hash,
-	) -> sp_blockchain::Result<Option<<Block as BlockT>::Header>> {
+	) -> sp_blockchain::Result<Option<<Block as sp_runtime::traits::HeaderProvider>::Header>> {
 		Ok(self.storage.read().blocks.get(&hash).map(|b| b.header().clone()))
 	}
 
@@ -366,7 +366,7 @@ impl<Block: BlockT> HeaderBackend<Block> for Blockchain<Block> {
 
 	fn hash(
 		&self,
-		number: <<Block as BlockT>::Header as HeaderT>::Number,
+		number: <<Block as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number,
 	) -> sp_blockchain::Result<Option<Block::Hash>> {
 		Ok(self.id(BlockId::Number(number)))
 	}
@@ -525,7 +525,7 @@ impl<Block: BlockT> backend::BlockImportOperation<Block> for BlockImportOperatio
 
 	fn set_block_data(
 		&mut self,
-		header: <Block as BlockT>::Header,
+		header: <Block as sp_runtime::traits::HeaderProvider>::Header,
 		body: Option<Vec<<Block as BlockT>::Extrinsic>>,
 		_indexed_body: Option<Vec<Vec<u8>>>,
 		justifications: Option<Justifications>,

client/basic-authorship/src/basic_authorship.rs

@@ -38,7 +38,7 @@ use sp_consensus::{DisableProofRecording, EnableProofRecording, ProofRecording,
 use sp_core::traits::SpawnNamed;
 use sp_inherents::InherentData;
 use sp_runtime::{
-	traits::{BlakeTwo256, Block as BlockT, Hash as HashT, Header as HeaderT},
+	traits::{BlakeTwo256, Block as BlockT, Hash as HashT, Header as HeaderT, HeaderProvider},
 	Digest, Percent, SaturatedConversion,
 };
 use std::{marker::PhantomData, pin::Pin, sync::Arc, time};
@@ -190,7 +190,7 @@ where
 {
 	fn init_with_now(
 		&mut self,
-		parent_header: &<Block as BlockT>::Header,
+		parent_header: &<Block as sp_runtime::traits::HeaderProvider>::Header,
 		now: Box<dyn Fn() -> time::Instant + Send + Sync>,
 	) -> Proposer<B, Block, C, A, PR> {
 		let parent_hash = parent_header.hash();
@@ -235,7 +235,7 @@ where
 	type Proposer = Proposer<B, Block, C, A, PR>;
 	type Error = sp_blockchain::Error;
 
-	fn init(&mut self, parent_header: &<Block as BlockT>::Header) -> Self::CreateProposer {
+	fn init(&mut self, parent_header: &<Block as sp_runtime::traits::HeaderProvider>::Header) -> Self::CreateProposer {
 		future::ready(Ok(self.init_with_now(parent_header, Box::new(time::Instant::now))))
 	}
 }
@@ -245,7 +245,7 @@ pub struct Proposer<B, Block: BlockT, C, A: TransactionPool, PR> {
 	spawn_handle: Box<dyn SpawnNamed>,
 	client: Arc<C>,
 	parent_hash: Block::Hash,
-	parent_number: <<Block as BlockT>::Header as HeaderT>::Number,
+	parent_number: <<Block as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number,
 	transaction_pool: Arc<A>,
 	now: Box<dyn Fn() -> time::Instant + Send + Sync>,
 	metrics: PrometheusMetrics,

client/block-builder/src/lib.rs

@@ -162,7 +162,7 @@ where
 		inherent_digests: Digest,
 		backend: &'a B,
 	) -> Result<Self, Error> {
-		let header = <<Block as BlockT>::Header as HeaderT>::new(
+		let header = <<Block as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::new(
 			parent_number + One::one(),
 			Default::default(),
 			Default::default(),

client/chain-spec/src/genesis.rs

@@ -65,13 +65,13 @@ pub fn construct_genesis_block<Block: BlockT>(
 	state_root: Block::Hash,
 	state_version: StateVersion,
 ) -> Block {
-	let extrinsics_root = <<<Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
+	let extrinsics_root = <<<Block as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Hashing as HashT>::trie_root(
 		Vec::new(),
 		state_version,
 	);
 
 	Block::new(
-		<<Block as BlockT>::Header as HeaderT>::new(
+		<<Block as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::new(
 			Zero::zero(),
 			extrinsics_root,
 			state_root,

client/cli/src/commands/chain_info_cmd.rs

@@ -45,13 +45,13 @@ struct ChainInfo<B: BlockT> {
 	/// Best block hash.
 	best_hash: B::Hash,
 	/// Best block number.
-	best_number: <<B as BlockT>::Header as HeaderT>::Number,
+	best_number: <<B as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number,
 	/// Genesis block hash.
 	genesis_hash: B::Hash,
 	/// The head of the finalized chain.
 	finalized_hash: B::Hash,
 	/// Last finalized block number.
-	finalized_number: <<B as BlockT>::Header as HeaderT>::Number,
+	finalized_number: <<B as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number,
 }
 
 impl<B: BlockT> From<Info<B>> for ChainInfo<B> {

client/cli/src/commands/revert_cmd.rs

@@ -63,7 +63,7 @@ impl RevertCmd {
 		B: BlockT,
 		BA: Backend<B>,
 		C: UsageProvider<B>,
-		<<<B as BlockT>::Header as HeaderT>::Number as FromStr>::Err: Debug,
+		<<<B as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number as FromStr>::Err: Debug,
 	{
 		let blocks = self.num.parse()?;
 		if let Some(aux_revert) = aux_revert {

client/consensus/aura/src/lib.rs

@@ -590,7 +590,7 @@ mod tests {
 		type CreateProposer = futures::future::Ready<Result<DummyProposer, Error>>;
 		type Error = Error;
 
-		fn init(&mut self, parent_header: &<TestBlock as BlockT>::Header) -> Self::CreateProposer {
+		fn init(&mut self, parent_header: &<TestBlock as sp_runtime::traits::HeaderProvider>::Header) -> Self::CreateProposer {
 			futures::future::ready(Ok(DummyProposer(parent_header.number + 1, self.0.clone())))
 		}
 	}

client/consensus/babe/src/lib.rs

@@ -698,7 +698,7 @@ impl<B: BlockT> Future for BabeWorker<B> {
 
 /// Slot notification sinks.
 type SlotNotificationSinks<B> = Arc<
-	Mutex<Vec<Sender<(Slot, ViableEpochDescriptor<<B as BlockT>::Hash, NumberFor<B>, Epoch>)>>>,
+	Mutex<Vec<Sender<(Slot, ViableEpochDescriptor<<B as sp_runtime::traits::HeaderProvider>::Hash, NumberFor<B>, Epoch>)>>>,
 >;
 
 struct BabeSlotWorker<B: BlockT, C, E, I, SO, L, BS> {

client/consensus/babe/src/tests.rs

@@ -84,7 +84,7 @@ impl Environment<TestBlock> for DummyFactory {
 	type Proposer = DummyProposer;
 	type Error = Error;
 
-	fn init(&mut self, parent_header: &<TestBlock as BlockT>::Header) -> Self::CreateProposer {
+	fn init(&mut self, parent_header: &<TestBlock as sp_runtime::traits::HeaderProvider>::Header) -> Self::CreateProposer {
 		future::ready(Ok(DummyProposer {
 			factory: self.clone(),
 			parent_hash: parent_header.hash(),
@@ -178,7 +178,7 @@ pub struct BabeTestNet {
 	peers: Vec<BabePeer>,
 }
 
-type TestHeader = <TestBlock as BlockT>::Header;
+type TestHeader = <TestBlock as sp_runtime::traits::HeaderProvider>::Header;
 
 type TestSelectChain =
 	substrate_test_runtime_client::LongestChain<substrate_test_runtime_client::Backend, TestBlock>;

client/consensus/common/src/import_queue.rs

@@ -72,9 +72,9 @@ pub type RuntimeOrigin = libp2p_identity::PeerId;
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub struct IncomingBlock<B: BlockT> {
 	/// Block header hash.
-	pub hash: <B as BlockT>::Hash,
+	pub hash: <B as sp_runtime::traits::HeaderProvider>::Hash,
 	/// Block header if requested.
-	pub header: Option<<B as BlockT>::Header>,
+	pub header: Option<<B as sp_runtime::traits::HeaderProvider>::Header>,
 	/// Block body if requested.
 	pub body: Option<Vec<<B as BlockT>::Extrinsic>>,
 	/// Indexed block body if requested.

client/consensus/common/src/longest_chain.rs

@@ -21,7 +21,7 @@
 use sc_client_api::backend;
 use sp_blockchain::{Backend, HeaderBackend};
 use sp_consensus::{Error as ConsensusError, SelectChain};
-use sp_runtime::traits::{Block as BlockT, Header, NumberFor};
+use sp_runtime::traits::{Block as BlockT, Header, HeaderProvider, NumberFor};
 use std::{marker::PhantomData, sync::Arc};
 
 /// Implement Longest Chain Select implementation
@@ -59,7 +59,7 @@ where
 		Ok(best_hash)
 	}
 
-	fn best_header(&self) -> sp_blockchain::Result<<Block as BlockT>::Header> {
+	fn best_header(&self) -> sp_blockchain::Result<<Block as sp_runtime::traits::HeaderProvider>::Header> {
 		let best_hash = self.best_hash()?;
 		Ok(self
 			.backend
@@ -142,7 +142,7 @@ where
 		LongestChain::leaves(self).map_err(|e| ConsensusError::ChainLookup(e.to_string()))
 	}
 
-	async fn best_chain(&self) -> Result<<Block as BlockT>::Header, ConsensusError> {
+	async fn best_chain(&self) -> Result<<Block as sp_runtime::traits::HeaderProvider>::Header, ConsensusError> {
 		LongestChain::best_header(self).map_err(|e| ConsensusError::ChainLookup(e.to_string()))
 	}
 

client/consensus/grandpa/src/environment.rs

@@ -61,7 +61,7 @@ use crate::{
 };
 
 type HistoricalVotes<Block> = finality_grandpa::HistoricalVotes<
-	<Block as HeaderProvider>::Hash,
+	<Block as sp_runtime::traits::HeaderProvider>::Hash,
 	NumberFor<Block>,
 	AuthoritySignature,
 	AuthorityId,
@@ -167,7 +167,7 @@ impl<Block: BlockT> CompletedRounds<Block> {
 
 /// A map with voter status information for currently live rounds,
 /// which votes have we cast and what are they.
-pub type CurrentRounds<Block> = BTreeMap<RoundNumber, HasVoted<<Block as BlockT>::Header>>;
+pub type CurrentRounds<Block> = BTreeMap<RoundNumber, HasVoted<<Block as sp_runtime::traits::HeaderProvider>::Header>>;
 
 /// The state of the current voter set, whether it is currently active or not
 /// and information related to the previously completed rounds. Current round

client/consensus/grandpa/src/lib.rs

@@ -159,7 +159,7 @@ mod tests;
 /// exposed publicly, used internally to simplify types in the communication
 /// layer.
 type CommunicationIn<Block> = voter::CommunicationIn<
-	<Block as HeaderProvider>::Hash,
+	<Block as sp_runtime::traits::HeaderProvider>::Hash,
 	NumberFor<Block>,
 	AuthoritySignature,
 	AuthorityId,

client/consensus/grandpa/src/tests.rs

@@ -212,12 +212,12 @@ impl GenesisAuthoritySetProvider<Block> for TestApi {
 #[derive(Clone, Default)]
 struct MockSelectChain {
 	leaves: Arc<Mutex<Option<Vec<Hash>>>>,
-	best_chain: Arc<Mutex<Option<<Block as BlockT>::Header>>>,
+	best_chain: Arc<Mutex<Option<<Block as sp_runtime::traits::HeaderProvider>::Header>>>,
 	finality_target: Arc<Mutex<Option<Hash>>>,
 }
 
 impl MockSelectChain {
-	fn set_best_chain(&self, best: <Block as BlockT>::Header) {
+	fn set_best_chain(&self, best: <Block as sp_runtime::traits::HeaderProvider>::Header) {
 		*self.best_chain.lock() = Some(best);
 	}
 
@@ -232,7 +232,7 @@ impl SelectChain<Block> for MockSelectChain {
 		Ok(self.leaves.lock().take().unwrap())
 	}
 
-	async fn best_chain(&self) -> Result<<Block as BlockT>::Header, ConsensusError> {
+	async fn best_chain(&self) -> Result<<Block as sp_runtime::traits::HeaderProvider>::Header, ConsensusError> {
 		Ok(self.best_chain.lock().take().unwrap())
 	}
 
@@ -256,9 +256,9 @@ where
 	fn restrict_vote(
 		&self,
 		_backend: Arc<B>,
-		_base: &<Block as BlockT>::Header,
-		best_target: &<Block as BlockT>::Header,
-		_current_target: &<Block as BlockT>::Header,
+		_base: &<Block as sp_runtime::traits::HeaderProvider>::Header,
+		best_target: &<Block as sp_runtime::traits::HeaderProvider>::Header,
+		_current_target: &<Block as sp_runtime::traits::HeaderProvider>::Header,
 	) -> VotingRuleResult<Block> {
 		if let Some(expected) = *self.0.lock() {
 			assert_eq!(best_target.hash(), expected);

client/consensus/grandpa/src/until_imported.rs

@@ -394,7 +394,7 @@ pub(crate) type UntilVoteTargetImported<Block, BlockStatus, BlockSyncRequester,
 	BlockStatus,
 	BlockSyncRequester,
 	I,
-	SignedMessage<<Block as BlockT>::Header>,
+	SignedMessage<<Block as sp_runtime::traits::HeaderProvider>::Header>,
 >;
 
 /// This blocks a global message import, i.e. a commit or catch up messages,