pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-14 16:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make impl_opaque_keys more scope independent (#2873)

Browse Source
This commit is contained in:
Bastian Köcher
2019-06-15 07:41:46 +02:00
committed by GitHub
parent 2082e9468e
commit db5722adc3
5 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/sr-primitives/Cargo.toml
+2 -2
View File
@@ -8,7 +8,7 @@ edition = "2018"
num-traits = { version = "0.2", default-features = false } num-traits = { version = "0.2", default-features = false }
integer-sqrt = { version = "0.1.2" } integer-sqrt = { version = "0.1.2" }
serde = { version = "1.0", optional = true, features = ["derive"] } serde = { version = "1.0", optional = true, features = ["derive"] }
parity-codec = { version = "3.3", default-features = false, features = ["derive"] } codec = { package = "parity-codec", version = "3.5.1", default-features = false, features = ["derive"] }
substrate-primitives = { path = "../primitives", default-features = false } substrate-primitives = { path = "../primitives", default-features = false }
rstd = { package = "sr-std", path = "../sr-std", default-features = false } rstd = { package = "sr-std", path = "../sr-std", default-features = false }
runtime_io = { package = "sr-io", path = "../sr-io", default-features = false } runtime_io = { package = "sr-io", path = "../sr-io", default-features = false }
@@ -26,6 +26,6 @@ std = [
"log", "log",
"rstd/std", "rstd/std",
"runtime_io/std", "runtime_io/std",
"parity-codec/std", "codec/std",
"substrate-primitives/std", "substrate-primitives/std",
] ]
substrate/core/sr-primitives/src/lib.rs
+1 -1
View File
@@ -21,7 +21,7 @@
#![cfg_attr(not(feature = "std"), no_std)] #![cfg_attr(not(feature = "std"), no_std)]
#[doc(hidden)] #[doc(hidden)]
pub use parity_codec as codec; pub use codec;
#[cfg(feature = "std")] #[cfg(feature = "std")]
#[doc(hidden)] #[doc(hidden)]
pub use serde; pub use serde;
substrate/core/sr-primitives/src/traits.rs
+2 -2
View File
@@ -868,8 +868,8 @@ macro_rules! impl_opaque_keys {
$($rest:tt)* $($rest:tt)*
} }
) => { ) => {
#[derive(Default, Clone, PartialEq, Eq, Encode, Decode)] #[derive(Default, Clone, PartialEq, Eq, $crate::codec::Encode, $crate::codec::Decode)]
#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] #[cfg_attr(feature = "std", derive(Debug, $crate::serde::Serialize, $crate::serde::Deserialize))]
pub struct $name($( pub $t ,)*); pub struct $name($( pub $t ,)*);
impl $crate::traits::OpaqueKeys for $name { impl $crate::traits::OpaqueKeys for $name {
fn count() -> usize { fn count() -> usize {
substrate/node/runtime/Cargo.toml
+1 -1
View File
@@ -7,7 +7,7 @@ edition = "2018"
[dependencies] [dependencies]
integer-sqrt = { version = "0.1.2" } integer-sqrt = { version = "0.1.2" }
safe-mix = { version = "1.0", default-features = false } safe-mix = { version = "1.0", default-features = false }
parity-codec = { version = "3.3", default-features = false, features = ["derive"] } parity-codec = { version = "3.5.1", default-features = false, features = ["derive"] }
substrate-primitives = { path = "../../core/primitives", default-features = false } substrate-primitives = { path = "../../core/primitives", default-features = false }
client = { package = "substrate-client", path = "../../core/client", default-features = false } client = { package = "substrate-client", path = "../../core/client", default-features = false }
rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
substrate/node/runtime/src/lib.rs
-3
View File
@@ -21,7 +21,6 @@
#![recursion_limit="256"] #![recursion_limit="256"]
use rstd::prelude::*; use rstd::prelude::*;
use parity_codec::{Encode, Decode};
use support::{construct_runtime, parameter_types}; use support::{construct_runtime, parameter_types};
use substrate_primitives::u32_trait::{_1, _2, _3, _4}; use substrate_primitives::u32_trait::{_1, _2, _3, _4};
use node_primitives::{ use node_primitives::{
@@ -132,8 +131,6 @@ parameter_types! {
} }
type SessionHandlers = (Grandpa, Aura); type SessionHandlers = (Grandpa, Aura);
#[cfg(feature = "std")]
use serde::{Serialize, Deserialize};
impl_opaque_keys! { impl_opaque_keys! {
pub struct SessionKeys(grandpa::AuthorityId, AuraId); pub struct SessionKeys(grandpa::AuthorityId, AuraId);
} }