From 10925510deeff6c601e8260573f140c671962be2 Mon Sep 17 00:00:00 2001 From: brenzi Date: Tue, 19 Nov 2019 09:33:56 +0100 Subject: [PATCH] fix full_crypto (#4133) * hopefully fixing api-client with this * another use statement needed * using full path for Vec * next try * yet again * cleanup --- substrate/primitives/application-crypto/src/lib.rs | 2 +- substrate/primitives/application-crypto/src/traits.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/substrate/primitives/application-crypto/src/lib.rs b/substrate/primitives/application-crypto/src/lib.rs index a02b1003b2..dd8b02fc1d 100644 --- a/substrate/primitives/application-crypto/src/lib.rs +++ b/substrate/primitives/application-crypto/src/lib.rs @@ -141,7 +141,7 @@ macro_rules! app_crypto_pair { <$pair>::verify_weak(sig, message, pubkey) } fn public(&self) -> Self::Public { Public(self.0.public()) } - fn to_raw_vec(&self) -> Vec { self.0.to_raw_vec() } + fn to_raw_vec(&self) -> $crate::Vec { self.0.to_raw_vec() } } impl $crate::AppKey for Pair { diff --git a/substrate/primitives/application-crypto/src/traits.rs b/substrate/primitives/application-crypto/src/traits.rs index 0c99d49ce3..0575d2ba06 100644 --- a/substrate/primitives/application-crypto/src/traits.rs +++ b/substrate/primitives/application-crypto/src/traits.rs @@ -41,9 +41,9 @@ pub trait AppKey: 'static + Send + Sync + Sized + CryptoType + Clone { } /// Type which implements Hash in std, not when no-std (std variant). -#[cfg(feature = "std")] +#[cfg(any(feature = "std", feature = "full_crypto"))] pub trait MaybeHash: rstd::hash::Hash {} -#[cfg(feature = "std")] +#[cfg(any(feature = "std", feature = "full_crypto"))] impl MaybeHash for T {} /// Type which implements Hash in std, not when no-std (no-std variant).