Reflect paritytech/substrate#10080

Author: JoshOrndorff

nimbus-consensus/src/lib.rs

@@ -45,7 +45,7 @@ use tracing::error;
 use sp_keystore::{SyncCryptoStorePtr, SyncCryptoStore};
 use sp_core::crypto::Public;
 use sp_std::convert::TryInto;
-use nimbus_primitives::{AuthorFilterAPI, NimbusApi, NIMBUS_KEY_ID, NimbusId};
+use nimbus_primitives::{AuthorFilterAPI, NimbusApi, NIMBUS_KEY_ID, NimbusId, digests::CompatibleDigestItem};
 mod import_queue;
 
 const LOG_TARGET: &str = "filtering-consensus";
@@ -315,7 +315,7 @@ where
 				.clone()
 				.try_into().ok()?;
 
-		let sig_digest = <sp_runtime::traits::DigestItemFor<B> as nimbus_primitives::digests::CompatibleDigestItem>::nimbus_seal(signature);
+		let sig_digest = <sp_runtime::DigestItem as CompatibleDigestItem>::nimbus_seal(signature);
 
 		let mut block_import_params = BlockImportParams::new(BlockOrigin::Own, header.clone());
 		block_import_params.post_digests.push(sig_digest.clone());

nimbus-primitives/src/digests.rs

@@ -25,8 +25,7 @@
 
 use crate::{NIMBUS_ENGINE_ID, NimbusSignature, NimbusId};
 use sp_runtime::generic::DigestItem;
-use parity_scale_codec::{Encode, Codec};
-use sp_std::fmt::Debug;
+use parity_scale_codec::Encode;
 
 /// A digest item which is usable with aura consensus.
 pub trait CompatibleDigestItem: Sized {
@@ -43,9 +42,7 @@ pub trait CompatibleDigestItem: Sized {
 	fn as_nimbus_consensus_digest(&self) -> Option<NimbusId>;
 }
 
-impl<Hash> CompatibleDigestItem for DigestItem<Hash> where
-	Hash: Debug + Send + Sync + Eq + Clone + Codec + 'static
-{
+impl CompatibleDigestItem for DigestItem {
 	fn nimbus_seal(signature: NimbusSignature) -> Self {
 		DigestItem::Seal(NIMBUS_ENGINE_ID, signature.encode())
 	}

pallets/author-inherent/src/lib.rs

@@ -118,7 +118,7 @@ pub mod pallet {
 			Author::<T>::put(&account);
 
 			// Add a consensus digest so the client-side worker can verify the block is signed by the right person.
-			frame_system::Pallet::<T>::deposit_log(DigestItem::<T::Hash>::Consensus(
+			frame_system::Pallet::<T>::deposit_log(DigestItem::Consensus(
 				NIMBUS_ENGINE_ID,
 				author.encode(),
 			));