diff --git a/polkadot/consensus/src/lib.rs b/polkadot/consensus/src/lib.rs index 6c39dc66e7..7edc78ea11 100644 --- a/polkadot/consensus/src/lib.rs +++ b/polkadot/consensus/src/lib.rs @@ -661,7 +661,7 @@ pub struct CreateProposal { impl CreateProposal where C: PolkadotApi { fn propose_with(&self, candidates: Vec) -> Result { use polkadot_api::BlockBuilder; - use runtime_primitives::traits::{Hashing, BlakeTwo256}; + use runtime_primitives::traits::{Hash as HashT, BlakeTwo256}; // TODO: handle case when current timestamp behind that in state. let timestamp = current_timestamp(); diff --git a/polkadot/primitives/src/parachain.rs b/polkadot/primitives/src/parachain.rs index dc77669785..ba528bb148 100644 --- a/polkadot/primitives/src/parachain.rs +++ b/polkadot/primitives/src/parachain.rs @@ -192,7 +192,7 @@ impl CandidateReceipt { /// Get the blake2_256 hash #[cfg(feature = "std")] pub fn hash(&self) -> Hash { - use runtime_primitives::traits::{BlakeTwo256, Hashing}; + use runtime_primitives::traits::{BlakeTwo256, Hash}; BlakeTwo256::hash_of(self) } } @@ -247,7 +247,7 @@ impl BlockData { /// Compute hash of block data. #[cfg(feature = "std")] pub fn hash(&self) -> Hash { - use runtime_primitives::traits::{BlakeTwo256, Hashing}; + use runtime_primitives::traits::{BlakeTwo256, Hash}; BlakeTwo256::hash(&self.0[..]) } } diff --git a/polkadot/runtime/src/parachains.rs b/polkadot/runtime/src/parachains.rs index 0ac9522ea0..809ff0396b 100644 --- a/polkadot/runtime/src/parachains.rs +++ b/polkadot/runtime/src/parachains.rs @@ -19,7 +19,7 @@ use rstd::prelude::*; use codec::Slicable; -use runtime_primitives::traits::{Hashing, BlakeTwo256, Executable, RefInto, MaybeEmpty}; +use runtime_primitives::traits::{Hash, BlakeTwo256, Executable, RefInto, MaybeEmpty}; use primitives::parachain::{Id, Chain, DutyRoster, CandidateReceipt}; use {system, session}; diff --git a/polkadot/transaction-pool/src/lib.rs b/polkadot/transaction-pool/src/lib.rs index 5f344035ce..6e0ec39d77 100644 --- a/polkadot/transaction-pool/src/lib.rs +++ b/polkadot/transaction-pool/src/lib.rs @@ -49,7 +49,7 @@ use extrinsic_pool::api::ExtrinsicPool; use polkadot_api::PolkadotApi; use primitives::{AccountId, BlockId, Hash, Index, UncheckedExtrinsic as FutureProofUncheckedExtrinsic}; use runtime::{Address, UncheckedExtrinsic}; -use substrate_runtime_primitives::traits::{Bounded, Checkable, Hashing, BlakeTwo256}; +use substrate_runtime_primitives::traits::{Bounded, Checkable, Hash as HashT, BlakeTwo256}; pub use extrinsic_pool::txpool::{Options, Status, LightStatus, VerifiedTransaction as VerifiedTransactionOps}; pub use error::{Error, ErrorKind, Result};