Fix compilation of sp-authorship (#4337)

This commit is contained in:
Bastian Köcher
2019-12-09 21:18:29 +01:00
committed by Gavin Wood
parent e5b6935c2a
commit a868fcbbbf
2 changed files with 9 additions and 8 deletions
+6 -5
View File
@@ -6,15 +6,16 @@ description = "Authorship primitives"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
sp-inherents = { package = "sp-inherents", path = "../inherents", default-features = false } sp-inherents = { path = "../inherents", default-features = false }
sr-primitives = { package = "sp-runtime", path = "../sr-primitives", default-features = false } sp-runtime = { path = "../runtime", default-features = false }
rstd = { package = "sp-std", path = "../sr-std", default-features = false } rstd = { package = "sp-std", path = "../sr-std", default-features = false }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
[features] [features]
default = [ "std" ] default = [ "std" ]
std = [ std = [
"codec/std", "codec/std",
"rstd/std", "rstd/std",
"sp-inherents/std", "sp-inherents/std",
"sp-runtime/std",
] ]
+2 -2
View File
@@ -22,13 +22,13 @@ use rstd::{result::Result, prelude::*};
use codec::{Encode, Decode}; use codec::{Encode, Decode};
use sp_inherents::{Error, InherentIdentifier, InherentData, IsFatalError}; use sp_inherents::{Error, InherentIdentifier, InherentData, IsFatalError};
use sr_primitives::RuntimeString; use sp_runtime::RuntimeString;
/// The identifier for the `uncles` inherent. /// The identifier for the `uncles` inherent.
pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"uncles00"; pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"uncles00";
/// Errors that can occur while checking the authorship inherent. /// Errors that can occur while checking the authorship inherent.
#[derive(Encode, sr_primitives::RuntimeDebug)] #[derive(Encode, sp_runtime::RuntimeDebug)]
#[cfg_attr(feature = "std", derive(Decode))] #[cfg_attr(feature = "std", derive(Decode))]
pub enum InherentError { pub enum InherentError {
Uncles(RuntimeString), Uncles(RuntimeString),