From fff90e86c0ff7cb70268fecae11048aa68c0566e Mon Sep 17 00:00:00 2001
From: DemiMarie-parity <48690212+DemiMarie-parity@users.noreply.github.com>
Date: Mon, 3 Jun 2019 10:34:38 -0400
Subject: [PATCH] Remove spurious `#[derive(Encode, Decode)]` (#2759)
They did not compile, since `Encode` and `Decode` are deliberately not
implemented for `usize`.
---
substrate/node/runtime/src/lib.rs | 2 +-
substrate/srml/aura/src/lib.rs | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/substrate/node/runtime/src/lib.rs b/substrate/node/runtime/src/lib.rs
index d243357fc2e..1e31e5400e7 100644
--- a/substrate/node/runtime/src/lib.rs
+++ b/substrate/node/runtime/src/lib.rs
@@ -59,7 +59,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
impl_name: create_runtime_str!("substrate-node"),
authoring_version: 10,
spec_version: 89,
- impl_version: 89,
+ impl_version: 90,
apis: RUNTIME_API_VERSIONS,
};
diff --git a/substrate/srml/aura/src/lib.rs b/substrate/srml/aura/src/lib.rs
index 646ad972d0c..3b557e2944a 100644
--- a/substrate/srml/aura/src/lib.rs
+++ b/substrate/srml/aura/src/lib.rs
@@ -57,7 +57,6 @@ use primitives::traits::{SaturatedConversion, Saturating, Zero, One};
use timestamp::OnTimestampSet;
#[cfg(feature = "std")]
use timestamp::TimestampInherentData;
-use parity_codec::{Encode, Decode};
use inherents::{RuntimeString, InherentIdentifier, InherentData, ProvideInherent, MakeFatalError};
#[cfg(feature = "std")]
use inherents::{InherentDataProviders, ProvideInherentData};
@@ -133,6 +132,7 @@ impl ProvideInherentData for InherentDataProvider {
}
fn error_to_string(&self, error: &[u8]) -> Option<String> {
+ use parity_codec::Decode;
RuntimeString::decode(&mut &error[..]).map(Into::into)
}
}
@@ -163,7 +163,7 @@ decl_module! {
}
/// A report of skipped authorities in Aura.
-#[derive(Clone, Encode, Decode, PartialEq, Eq)]
+#[derive(Clone, PartialEq, Eq)]
#[cfg_attr(feature = "std", derive(Debug))]
pub struct AuraReport {
// The first skipped slot.
--
GitLab