Merge branch 'master' into rh-grandpa-dynamic2

substrate/core/consensus/aura/src/lib.rs

@@ -130,22 +130,7 @@ pub trait CompatibleDigestItem: Sized {
 	fn as_aura_seal(&self) -> Option<(u64, &ed25519::Signature)>;
 }
 
-impl CompatibleDigestItem for generic::DigestItem<primitives::H256, u64> {
-	/// Construct a digest item which is a slot number and a signature on the
-	/// hash.
-	fn aura_seal(slot_number: u64, signature: ed25519::Signature) -> Self {
-		generic::DigestItem::Seal(slot_number, signature)
-	}
-	/// If this item is an Aura seal, return the slot number and signature.
-	fn as_aura_seal(&self) -> Option<(u64, &ed25519::Signature)> {
-		match self {
-			generic::DigestItem::Seal(slot, ref sign) => Some((*slot, sign)),
-			_ => None
-		}
-	}
-}
-
-impl CompatibleDigestItem for generic::DigestItem<primitives::H256, primitives::AuthorityId> {
+impl<Hash, AuthorityId> CompatibleDigestItem for generic::DigestItem<Hash, AuthorityId> {
 	/// Construct a digest item which is a slot number and a signature on the
 	/// hash.
 	fn aura_seal(slot_number: u64, signature: ed25519::Signature) -> Self {
@@ -255,8 +240,8 @@ pub fn start_aura<B, C, E, SO, Error>(
 						let import_block = ImportBlock {
 							origin: BlockOrigin::Own,
 							header,
-							external_justification: Vec::new(),
-							post_runtime_digests: vec![item],
+							justification: Vec::new(),
+							post_digests: vec![item],
 							body: Some(body),
 							finalized: false,
 							auxiliary: Vec::new(),
@@ -380,8 +365,8 @@ impl<B: Block, C> Verifier<B> for AuraVerifier<C> where
 				let import_block = ImportBlock {
 					origin,
 					header: pre_header,
-					external_justification: Vec::new(),
-					post_runtime_digests: vec![item],
+					justification: Vec::new(),
+					post_digests: vec![item],
 					body,
 					finalized: false,
 					auxiliary: Vec::new(),
@@ -420,7 +405,7 @@ mod tests {
 	use network::test::*;
 	use network::test::{Block as TestBlock, PeersClient};
 	use runtime_primitives::traits::Block as BlockT;
-	use network::ProtocolConfig;
+	use network::config::ProtocolConfig;
 	use parking_lot::Mutex;
 	use tokio::runtime::current_thread;
 	use keyring::Keyring;
@@ -429,7 +414,7 @@ mod tests {
 
 	type Error = client::error::Error;
 
-	type TestClient = client::Client<test_client::Backend, test_client::Executor, TestBlock>;
+	type TestClient = client::Client<test_client::Backend, test_client::Executor, TestBlock, test_client::runtime::ClientWithApi>;
 
 	struct DummyFactory(Arc<TestClient>);
 	struct DummyProposer(u64, Arc<TestClient>);

substrate/core/consensus/common/README.adoc

@@ -1,12 +0,0 @@
-= Consensus Common
-
-.Summary
-[source, toml]
-----
-include::Cargo.toml[lines=2..5]
-----
-
-.Description
-----
-include::src/lib.rs[tag=description]
-----

substrate/core/consensus/common/src/block_import.rs

@@ -44,7 +44,7 @@ pub struct ImportBlock<Block: BlockT> {
 	///
 	/// Consensus engines which alter the header (by adding post-runtime digests)
 	/// should strip those off in the initial verification process and pass them
-	/// via the `post_runtime_digests` field. During block authorship, they should
+	/// via the `post_digests` field. During block authorship, they should
 	/// not be pushed to the header directly.
 	///
 	/// The reason for this distinction is so the header can be directly
@@ -52,10 +52,10 @@ pub struct ImportBlock<Block: BlockT> {
 	/// post-runtime digests are pushed back on after.
 	pub header: Block::Header,
 	/// Justification provided for this block from the outside:.
-	pub external_justification: Justification,
+	pub justification: Justification,
 	/// Digest items that have been added after the runtime for external
 	/// work, like a consensus signature.
-	pub post_runtime_digests: Vec<DigestItemFor<Block>>,
+	pub post_digests: Vec<DigestItemFor<Block>>,
 	/// Block's body
 	pub body: Option<Vec<Block::Extrinsic>>,
 	/// Is this block finalized already?
@@ -82,8 +82,8 @@ impl<Block: BlockT> ImportBlock<Block> {
 		(
 			self.origin,
 			self.header,
-			self.external_justification,
-			self.post_runtime_digests,
+			self.justification,
+			self.post_digests,
 			self.body,
 			self.finalized,
 			self.auxiliary,

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

@@ -14,9 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate Consensus Common.  If not, see <http://www.gnu.org/licenses/>.
 
-// tag::description[]
-//! Consensus basics and common features
-// end::description[]
+//! Tracks offline validators.
 
 // This provides "unused" building blocks to other crates
 #![allow(dead_code)]

substrate/core/consensus/rhd/README.adoc

@@ -1,12 +0,0 @@
-= Consensus Rhododendron (RHD)
-
-.Summary
-[source, toml]
-----
-include::Cargo.toml[lines=2..5]
-----
-
-.Description
-----
-include::src/lib.rs[tag=description]
-----

substrate/core/consensus/rhd/src/lib.rs

@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-// tag::description[]
 //! BFT Agreement based on a rotating proposer in different rounds.
 //!
 //! Where this crate refers to input stream, should never logically conclude.
@@ -30,7 +29,6 @@
 //! conclude without having witnessed the conclusion.
 //! In general, this future should be pre-empted by the import of a justification
 //! set for this block height.
-// end::description[]
 
 #![cfg(feature="rhd")]
 // FIXME: doesn't compile - https://github.com/paritytech/substrate/issues/1020
@@ -419,10 +417,10 @@ impl<B, P, I, InStream, OutSink> Future for BftFuture<B, P, I, InStream, OutSink
 			let import_block = ImportBlock {
 				origin: BlockOrigin::ConsensusBroadcast,
 				header: header,
-				external_justification: just.into(),
+				justification: just.into(),
 				body: Some(body),
 				finalized: true,
-				post_runtime_digests: Default::default(),
+				post_digests: Default::default(),
 				auxiliary: Default::default()
 			};