removed evaluation.rs (#11766)

* removed evaluation.rs

* no need for parent_hash

* fix

substrate/client/basic-authorship/src/basic_authorship.rs

@@ -34,9 +34,7 @@ use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_INFO};
 use sc_transaction_pool_api::{InPoolTransaction, TransactionPool};
 use sp_api::{ApiExt, ProvideRuntimeApi};
 use sp_blockchain::{ApplyExtrinsicFailed::Validity, Error::ApplyExtrinsicFailed, HeaderBackend};
-use sp_consensus::{
-	evaluation, DisableProofRecording, EnableProofRecording, ProofRecording, Proposal,
-};
+use sp_consensus::{DisableProofRecording, EnableProofRecording, ProofRecording, Proposal};
 use sp_core::traits::SpawnNamed;
 use sp_inherents::InherentData;
 use sp_runtime::{
@@ -205,7 +203,6 @@ where
 		let proposer = Proposer::<_, _, _, _, PR> {
 			spawn_handle: self.spawn_handle.clone(),
 			client: self.client.clone(),
-			parent_hash,
 			parent_id: id,
 			parent_number: *parent_header.number(),
 			transaction_pool: self.transaction_pool.clone(),
@@ -250,7 +247,6 @@ where
 pub struct Proposer<B, Block: BlockT, C, A: TransactionPool, PR> {
 	spawn_handle: Box<dyn SpawnNamed>,
 	client: Arc<C>,
-	parent_hash: <Block as BlockT>::Hash,
 	parent_id: BlockId<Block>,
 	parent_number: <<Block as BlockT>::Header as HeaderT>::Number,
 	transaction_pool: Arc<A>,
@@ -536,12 +532,6 @@ where
 			"hash" => ?<Block as BlockT>::Hash::from(block.header().hash()),
 		);
 
-		if let Err(err) =
-			evaluation::evaluate_initial(&block, &self.parent_hash, self.parent_number)
-		{
-			error!("Failed to evaluate authored block: {:?}", err);
-		}
-
 		let proof =
 			PR::into_proof(proof).map_err(|e| sp_blockchain::Error::Application(Box::new(e)))?;
 

substrate/primitives/consensus/common/src/evaluation.rs

@@ -1,74 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2018-2022 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Block evaluation and evaluation errors.
-
-use codec::Encode;
-use sp_runtime::traits::{Block as BlockT, CheckedConversion, Header as HeaderT, One};
-
-// This is just a best effort to encode the number. None indicated that it's too big to encode
-// in a u128.
-type BlockNumber = Option<u128>;
-
-/// Result type alias.
-pub type Result<T> = std::result::Result<T, Error>;
-
-/// Error type.
-#[derive(Debug, thiserror::Error)]
-pub enum Error {
-	#[error("Failed to verify block encoding/decoding")]
-	BadBlockCodec,
-	/// Proposal provided not a block.
-	#[error("Proposal provided not a block: decoding error: {0}")]
-	BadProposalFormat(#[from] codec::Error),
-	/// Proposal had wrong parent hash.
-	#[error("Proposal had wrong parent hash. Expected {expected:?}, got {got:?}")]
-	WrongParentHash { expected: String, got: String },
-	/// Proposal had wrong number.
-	#[error("Proposal had wrong number. Expected {expected:?}, got {got:?}")]
-	WrongNumber { expected: BlockNumber, got: BlockNumber },
-}
-
-/// Attempt to evaluate a substrate block as a node block, returning error
-/// upon any initial validity checks failing.
-pub fn evaluate_initial<Block: BlockT>(
-	proposal: &Block,
-	parent_hash: &<Block as BlockT>::Hash,
-	parent_number: <<Block as BlockT>::Header as HeaderT>::Number,
-) -> Result<()> {
-	let encoded = Encode::encode(proposal);
-	let block = Block::decode(&mut &encoded[..]).map_err(Error::BadProposalFormat)?;
-	if &block != proposal {
-		return Err(Error::BadBlockCodec)
-	}
-
-	if *parent_hash != *block.header().parent_hash() {
-		return Err(Error::WrongParentHash {
-			expected: format!("{:?}", *parent_hash),
-			got: format!("{:?}", block.header().parent_hash()),
-		})
-	}
-
-	if parent_number + One::one() != *block.header().number() {
-		return Err(Error::WrongNumber {
-			expected: parent_number.checked_into::<u128>().map(|x| x + 1),
-			got: (*block.header().number()).checked_into::<u128>(),
-		})
-	}
-
-	Ok(())
-}

substrate/primitives/consensus/common/src/lib.rs

@@ -33,7 +33,6 @@ use sp_state_machine::StorageProof;
 
 pub mod block_validation;
 pub mod error;
-pub mod evaluation;
 mod select_chain;
 
 pub use self::error::Error;