Fix signature and public tmp

core/consensus/babe/primitives/src/lib.rs

@@ -139,9 +139,10 @@ impl slots::SlotData for BabeConfiguration {
 }
 
 /// Represents an Babe equivocation proof.
-#[derive(Clone, Encode, Decode, PartialEq)]
+#[derive(Debug, Clone, Encode, Decode, PartialEq)]
 pub struct BabeEquivocationProof<H> {
 	identity: AuthorityId,
+	identity_proof: Proof,
 	slot: u64,
 	first_header: H,
 	second_header: H,
@@ -160,6 +161,7 @@ where
 	/// Create a new Babe equivocation proof.
 	fn new(
 		identity: Self::Identity,
+		identity_proof: Proof,
 		slot: u64,
 		first_header: H,
 		second_header: H,
@@ -168,6 +170,7 @@ where
 	) -> Self {
 		BabeEquivocationProof {
 			identity,
+			identity_proof,
 			slot,
 			first_header,
 			second_header,
@@ -186,6 +189,11 @@ where
 		&self.identity
 	}
 
+	/// Get the identity of the suspect of equivocating.
+	fn identity_proof(&self) -> &Proof {
+		&self.identity_proof
+	}
+
 	/// Get the first header involved in the equivocation.
 	fn first_header(&self) -> &H {
 		&self.first_header

core/consensus/babe/src/lib.rs

@@ -505,7 +505,7 @@ fn check_header<B: BlockT + Sized, C: AuxStore, T>(
 			}
 
 			if let Some(equivocation_proof) = check_equivocation::<
-				_, _, BabeEquivocationProof<B::Header>, _, _
+				_, _, BabeEquivocationProof<B::Header>, _
 			>(
 				client,
 				slot_now,

core/consensus/common/primitives/Cargo.toml

@@ -12,6 +12,7 @@ sr-primitives = { path = "../../../sr-primitives", default-features = false }
 rstd = { package = "sr-std", path = "../../../sr-std", default-features = false }
 serde = { version = "1.0", optional = true, features = ["derive"] }
 primitives = { package = "substrate-primitives", path = "../../../primitives", default-features = false }
+srml-session = { path = "../../../../srml/session", default-features = false }
 
 [features]
 default = ["std"]

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

@@ -24,7 +24,7 @@ use parity_codec::Codec;
 #[cfg(feature = "std")]
 use serde::Serialize;
 use sr_primitives::{traits::{Header, Verify}};
-
+use srml_session::historical::Proof;
 
 decl_runtime_apis! {
 	/// Common consensus runtime api.
@@ -42,6 +42,7 @@ pub trait AuthorshipEquivocationProof {
 	/// Create an equivocation proof for AuRa or Babe.
 	fn new(
 		identity: Self::Identity,
+		identity_proof: Proof,
 		slot: u64,
 		first_header: Self::Header,
 		second_header: Self::Header,
@@ -52,6 +53,9 @@ pub trait AuthorshipEquivocationProof {
 	/// Get the slot where the equivocation happened.
 	fn slot(&self) -> u64;
 
+	/// Get the identity proof of the suspect of equivocating.
+	fn identity_proof(&self) -> &Proof;
+
 	/// Get the identity of the suspect of equivocating.
 	fn identity(&self) -> &Self::Identity;
 

core/consensus/slots/Cargo.toml

@@ -13,6 +13,7 @@ sr-primitives = {  path = "../../sr-primitives" }
 consensus_common = { package = "substrate-consensus-common", path = "../common" }
 consensus_common_primitives = { package = "substrate-consensus-common-primitives", path = "../common/primitives" }
 inherents = { package = "substrate-inherents", path = "../../inherents" }
+srml-session = { path = "../../../srml/session", default-features = false }
 futures-preview = "0.3.0-alpha.17"
 futures-timer = "0.2.1"
 parking_lot = "0.8.0"

core/consensus/slots/src/aux_schema.rs

@@ -16,12 +16,13 @@
 
 //! Schema for slots in the aux-db.
 
+use std::ops::Deref;
 use codec::{Encode, Decode, Codec};
 use client::backend::AuxStore;
 use client::error::{Result as ClientResult, Error as ClientError};
 use sr_primitives::traits::{Header, Verify};
 use consensus_common_primitives::AuthorshipEquivocationProof;
-use std::ops::Deref;
+use srml_session::historical::Proof;
 
 const SLOT_HEADER_MAP_KEY: &[u8] = b"slot_header_map";
 const SLOT_HEADER_START: &[u8] = b"slot_header_start";
@@ -57,7 +58,7 @@ pub struct EquivocationProof<H> {
 /// Checks if the header is an equivocation and returns the proof in that case.
 ///
 /// Note: it detects equivocations only when slot_now - slot <= MAX_SLOT_CAPACITY.
-pub fn check_equivocation<C, H, E, V, P>(
+pub fn check_equivocation<C, H, E, V>(
 	backend: &C,
 	slot_now: u64,
 	slot: u64,
@@ -68,7 +69,6 @@ pub fn check_equivocation<C, H, E, V, P>(
 	where
 		H: Header,
 		C: AuxStore,
-		P: Clone + Encode + Decode + PartialEq,
 		V: Verify + Codec + Clone,
 		<V as Verify>::Signer: Clone + Codec + PartialEq,
 		E: AuthorshipEquivocationProof<
@@ -106,6 +106,7 @@ pub fn check_equivocation<C, H, E, V, P>(
 			if header.hash() != prev_header.hash() {
 				return Ok(Some(AuthorshipEquivocationProof::new(
 					signer.clone(),
+					Proof::default(),
 					slot,
 					prev_header.clone(),
 					header.clone(),

core/primitives/src/sr25519.rs

@@ -126,6 +126,20 @@ impl ::std::fmt::Debug for Public {
 	}
 }
 
+#[cfg(not(feature = "std"))]
+impl ::core::fmt::Debug for Public {
+	fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
+		write!(f, "")
+	}
+}
+
+#[cfg(not(feature = "std"))]
+impl ::core::fmt::Debug for Signature {
+	fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
+		write!(f, "")
+	}
+}
+
 #[cfg(feature = "std")]
 impl Serialize for Public {
 	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {

srml/session/src/historical.rs

@@ -270,8 +270,8 @@ impl<T: Trait> ProvingTrie<T> {
 }
 
 /// Proof of ownership of a specific key.
-#[cfg_attr(feature = "std", derive(Serialize, Debug))]
-#[derive(Encode, Decode, Clone, PartialEq, Eq, Default)]
+#[cfg_attr(feature = "std", derive(Serialize))]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, Default, Debug)]
 pub struct Proof {
 	session: SessionIndex,
 	trie_nodes: Vec<Vec<u8>>,