Fix up grandpa, remove system::Raw/Log

core/consensus/babe/src/lib.rs

@@ -32,7 +32,7 @@ pub use digest::{BabePreDigest, BABE_VRF_PREFIX};
 pub use babe_primitives::*;
 pub use consensus_common::SyncOracle;
 use consensus_common::{ExtraVerification, well_known_cache_keys::Id as CacheKeyId};
-use runtime_primitives::{generic, generic::BlockId, Justification};
+use runtime_primitives::{generic, generic::{BlockId, OpaqueDigestItemId}, Justification};
 use runtime_primitives::traits::{
 	Block, Header, Digest, DigestItemFor, DigestItem, ProvideRuntimeApi,
 	SimpleBitOps,
@@ -645,14 +645,12 @@ impl<B: Block, C, E> Verifier<B> for BabeVerifier<C, E> where
 
 				extra_verification.into_future().wait()?;
 
-				let maybe_keys = None;
-				/* TODO: make this work:
-					pre_header.digest()
-					.log(DigestItem::as_authorities_change)
-					.map(|digest| digest.to_vec())
-					.map(Encode::encode)
-					.map(|blob| vec![(well_known_cache_keys::AUTHORITIES, blob)]);
-				*/
+				// `Consensus` is the Babe-specific authorities change log.
+				// It's an encoded `Vec<AuthorityId>`, the same format as is stored in the cache,
+				// so no need to decode/re-encode.
+				let maybe_keys = pre_header.digest()
+					.log(|l| l.try_as_raw(OpaqueDigestItemId::Consensus(&BABE_ENGINE_ID)))
+					.map(|blob| vec![(well_known_cache_keys::AUTHORITIES, blob.to_vec())]);
 
 				let import_block = ImportBlock {
 					origin,

node-template/runtime/src/lib.rs

@@ -134,7 +134,6 @@ impl system::Trait for Runtime {
 
 impl aura::Trait for Runtime {
 	type HandleReport = ();
-	type Log = Log;
 }
 
 impl indices::Trait for Runtime {
@@ -187,9 +186,9 @@ construct_runtime!(
 		NodeBlock = opaque::Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: system::{default, Log(ChangesTrieRoot)},
+		System: system::{default, Config<T>},
 		Timestamp: timestamp::{Module, Call, Storage, Config<T>, Inherent},
-		Aura: aura::{Module, Config<T>, Inherent(Timestamp), Log(PreRuntime)},
+		Aura: aura::{Module, Config<T>, Inherent(Timestamp)},
 		Indices: indices::{default, Config<T>},
 		Balances: balances,
 		Sudo: sudo,

node/runtime/src/lib.rs

@@ -103,7 +103,6 @@ impl system::Trait for Runtime {
 
 impl aura::Trait for Runtime {
 	type HandleReport = aura::StakingSlasher<Runtime>;
-	type Log = Log;
 }
 
 impl indices::Trait for Runtime {
@@ -254,8 +253,8 @@ construct_runtime!(
 		NodeBlock = node_primitives::Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: system::{default, Config<T>, Log(ChangesTrieRoot)},
-		Aura: aura::{Module, Config<T>, Inherent(Timestamp), Log(PreRuntime)},
+		System: system::{default, Config<T>},
+		Aura: aura::{Module, Config<T>, Inherent(Timestamp)},
 		Timestamp: timestamp::{Module, Call, Storage, Config<T>, Inherent},
 		Indices: indices,
 		Balances: balances,
@@ -351,7 +350,6 @@ impl_runtime_apis! {
 		{
 			for log in digest.logs.iter().filter_map(|l| match l {
 				Log(InternalLog::grandpa(grandpa_signal)) => Some(grandpa_signal),
-				_ => None
 			}) {
 				if let Some(change) = Grandpa::scrape_digest_change(log) {
 					return Some(change);
@@ -365,7 +363,6 @@ impl_runtime_apis! {
 		{
 			for log in digest.logs.iter().filter_map(|l| match l {
 				Log(InternalLog::grandpa(grandpa_signal)) => Some(grandpa_signal),
-				_ => None
 			}) {
 				if let Some(change) = Grandpa::scrape_digest_forced_change(log) {
 					return Some(change);

srml/aura/src/lib.rs

@@ -54,7 +54,7 @@ use rstd::{result, prelude::*};
 use parity_codec::{Encode, Decode};
 use srml_support::storage::StorageValue;
 use srml_support::{decl_storage, decl_module};
-use primitives::traits::{SaturatedConversion, Saturating, Zero, One};
+use primitives::{traits::{SaturatedConversion, Saturating, Zero, One, Digest}, generic::DigestItem};
 use timestamp::OnTimestampSet;
 use rstd::marker::PhantomData;
 #[cfg(feature = "std")]
@@ -65,6 +65,7 @@ use inherents::{InherentDataProviders, ProvideInherentData};
 #[cfg(feature = "std")]
 use serde::Serialize;
 pub use substrate_consensus_aura_primitives::AuthorityId;
+use substrate_consensus_aura_primitives::AURA_ENGINE_ID;
 
 mod mock;
 mod tests;
@@ -94,45 +95,6 @@ impl AuraInherentData for InherentData {
 	}
 }
 
-/// Logs in this module.
-pub type Log<T> = RawLog<T>;
-
-/// Logs in this module.
-///
-/// The type parameter distinguishes logs belonging to two different runtimes,
-/// which should not be mixed.
-#[cfg_attr(feature = "std", derive(Serialize, Debug))]
-#[derive(Encode, Decode, PartialEq, Eq, Clone)]
-pub enum RawLog<T> {
-	/// AuRa inherent digests
-	PreRuntime([u8; 4], Vec<u8>, PhantomData<T>),
-	/// Authorities set has been changed. Contains the new set of authorities.
-	AuthoritiesChange(Vec<AuthorityId>),
-}
-
-impl<T> RawLog<T> {
-	/// Try to cast the log entry as AuthoritiesChange log entry.
-	pub fn as_authorities_change(&self) -> Option<&[AuthorityId]> {
-		match *self {
-			RawLog::AuthoritiesChange(ref item) => Some(item),
-			_ => None,
-		}
-	}
-}
-
-// Implementation for tests outside of this crate.
-#[cfg(any(feature = "std", test))]
-impl<N> From<RawLog<N>> for primitives::testing::DigestItem where N: Into<AuthorityId> {
-	fn from(log: RawLog<N>) -> primitives::testing::DigestItem {
-		match log {
-			RawLog::AuthoritiesChange(authorities) =>
-				primitives::generic::DigestItem::Consensus(*b"aura", authorities.encode()),
-			RawLog::PreRuntime(id, v, _) =>
-				primitives::generic::DigestItem::PreRuntime(id, v),
-		}
-	}
-}
-
 /// Provides the slot duration inherent data for `Aura`.
 #[cfg(feature = "std")]
 pub struct InherentDataProvider {
@@ -190,9 +152,6 @@ impl HandleReport for () {
 }
 
 pub trait Trait: timestamp::Trait {
-	/// Type for all log entries of this module.
-	type Log: From<Log<Self>> + Into<system::DigestItemOf<Self>>;
-
 	/// The logic for handling reports.
 	type HandleReport: HandleReport;
 }
@@ -215,11 +174,14 @@ impl<T: Trait> Module<T> {
 	fn change_authorities(new: Vec<AuthorityId>) {
 		<Authorities<T>>::put(&new);
 
+		let log: DigestItem<T::Hash> = DigestItem::Consensus(AURA_ENGINE_ID, new.encode());
+		//Self::deposit_log();
+		<system::Module<T>>::deposit_log(log.into());
 	}
 
 	/// Deposit one of this module's logs.
-	fn deposit_log(log: Log<T>) {
-		<system::Module<T>>::deposit_log(<T as Trait>::Log::from(log).into());
+	fn deposit_log<L>(log: L) where <<T as system::Trait>::Digest as Digest>::Item: From<L> {
+		<system::Module<T>>::deposit_log(log.into());
 	}
 }
 

srml/grandpa/src/lib.rs

@@ -33,17 +33,15 @@ pub use substrate_finality_grandpa_primitives as fg_primitives;
 #[cfg(feature = "std")]
 use serde::Serialize;
 use rstd::prelude::*;
-use parity_codec as codec;
-use codec::{Encode, Decode};
-use fg_primitives::ScheduledChange;
-use srml_support::{Parameter, decl_event, decl_storage, decl_module};
-use srml_support::{dispatch::Result};
-use srml_support::storage::StorageValue;
-use srml_support::storage::unhashed::StorageVec;
-use primitives::traits::CurrentHeight;
+use parity_codec::{self as codec, Encode, Decode};
 use substrate_primitives::ed25519;
+use srml_support::{
+	Parameter, decl_event, decl_storage, decl_module, dispatch::Result,
+	storage::{StorageValue, unhashed::StorageVec}
+};
+use primitives::traits::{self, CurrentHeight, MaybeSerializeDebug};
+use fg_primitives::ScheduledChange;
 use system::ensure_signed;
-use primitives::traits::MaybeSerializeDebug;
 
 // TODO: switch to import from aura primitives.
 use ed25519::Public as AuthorityId;
@@ -127,10 +125,10 @@ impl<N, SessionKey> GrandpaChangeSignal<N> for RawLog<N, SessionKey>
 }
 
 pub trait Trait: system::Trait {
-	/// Type for all log entries of this module.
-	type Log: From<Log<Self>> + Into<system::DigestItemOf<Self>>;
+	/// Overarching log type that can convert from/into log entries of this module.
+	type Log: traits::DigestItem<Hash=Self::Hash> + Into<<Self as system::Trait>::Log> + From<Log<Self>>;
 
-	/// The session key type used by authorities.
+	/// The key type used by Grandpa authorities to sign grandpa stuff.
 	type SessionKey: Parameter + Default + MaybeSerializeDebug;
 
 	/// The event type of this module.

srml/system/src/lib.rs

@@ -76,10 +76,10 @@ use serde::Serialize;
 use rstd::prelude::*;
 #[cfg(any(feature = "std", test))]
 use rstd::map;
-use primitives::traits::{self, CheckEqual, SimpleArithmetic, SimpleBitOps, One, Bounded, Lookup,
+use primitives::{generic::DigestItem, traits::{self, CheckEqual, SimpleArithmetic, SimpleBitOps,
 	Hash, Member, MaybeDisplay, EnsureOrigin, Digest as DigestT, CurrentHeight, BlockNumberToHash,
-	MaybeSerializeDebugButNotDeserialize, MaybeSerializeDebug, StaticLookup
-};
+	MaybeSerializeDebugButNotDeserialize, MaybeSerializeDebug, StaticLookup, One, Bounded, Lookup,
+}};
 #[cfg(any(feature = "std", test))]
 use primitives::traits::Zero;
 use substrate_primitives::storage::well_known_keys;
@@ -168,7 +168,7 @@ pub trait Trait: 'static + Eq + Clone {
 
 	/// Collection of (light-client-relevant) logs for a block to be included verbatim in the block header.
 	type Digest:
-		Parameter + Member + MaybeSerializeDebugButNotDeserialize + Default + traits::Digest<Hash = Self::Hash>;
+		Parameter + Member + MaybeSerializeDebugButNotDeserialize + Default + traits::Digest<Hash=Self::Hash, Item=Self::Log>;
 
 	/// The user account identifier type for the runtime.
 	type AccountId: Parameter + Member + MaybeSerializeDebug + MaybeDisplay + Ord + Default;
@@ -191,7 +191,7 @@ pub trait Trait: 'static + Eq + Clone {
 	type Event: Parameter + Member + From<Event>;
 
 	/// A piece of information that can be part of the digest (as a digest item).
-	type Log: From<Log<Self>> + Into<DigestItemOf<Self>>;
+	type Log: traits::DigestItem<Hash=Self::Hash> + From<DigestItem<Self::Hash>>;
 }
 
 pub type DigestItemOf<T> = <<T as Trait>::Digest as traits::Digest>::Item;
@@ -295,38 +295,6 @@ impl<AccountId> From<Option<AccountId>> for RawOrigin<AccountId> {
 /// Exposed trait-generic origin type.
 pub type Origin<T> = RawOrigin<<T as Trait>::AccountId>;
 
-pub type Log<T> = RawLog<
-	<T as Trait>::Hash,
->;
-
-/// A log in this module.
-#[cfg_attr(feature = "std", derive(Serialize, Debug))]
-#[derive(Encode, Decode, PartialEq, Eq, Clone)]
-pub enum RawLog<Hash> {
-	/// Changes trie has been computed for this block. Contains the root of
-	/// changes trie.
-	ChangesTrieRoot(Hash),
-}
-
-impl<Hash: Member> RawLog<Hash> {
-	/// Try to cast the log entry as ChangesTrieRoot log entry.
-	pub fn as_changes_trie_root(&self) -> Option<&Hash> {
-		match *self {
-			RawLog::ChangesTrieRoot(ref item) => Some(item),
-		}
-	}
-}
-
-// Implementation for tests outside of this crate.
-#[cfg(any(feature = "std", test))]
-impl From<RawLog<substrate_primitives::H256>> for primitives::testing::DigestItem {
-	fn from(log: RawLog<substrate_primitives::H256>) -> primitives::testing::DigestItem {
-		match log {
-			RawLog::ChangesTrieRoot(root) => primitives::generic::DigestItem::ChangesTrieRoot(root),
-		}
-	}
-}
-
 // Create a Hash with 69 for each byte,
 // only used to build genesis config.
 #[cfg(feature = "std")]
@@ -611,8 +579,8 @@ impl<T: Trait> Module<T> {
 		// we can't compute changes trie root earlier && put it to the Digest
 		// because it will include all currently existing temporaries.
 		if let Some(storage_changes_root) = storage_changes_root {
-			let item = RawLog::ChangesTrieRoot(storage_changes_root);
-			let item = <T as Trait>::Log::from(item).into();
+			let item = DigestItem::ChangesTrieRoot(storage_changes_root);
+			let item = <T as Trait>::Log::from(item);
 			digest.push(item);
 		}