Make use of parity-codec "derive" crate feature (#1919)

* Make use of parity-codec "derive" crate feature

* Bump impl_version

* Update wasm files and Cargo.lock files

* Transferred to parity_codec derive feature for the rest of the crates

* Update wasm binaries and lock files

* Update core and node wasm binaries

substrate/srml/aura/Cargo.toml

@@ -6,8 +6,7 @@ edition = "2018"
 
 [dependencies]
 hex-literal = "0.1.0"
-parity-codec = { version = "3.1", default-features = false }
-parity-codec-derive = { version = "3.1", default-features = false }
+parity-codec = { version = "3.1", default-features = false, features = ["derive"] }
 serde = { version = "1.0", default-features = false }
 inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }

substrate/srml/aura/src/lib.rs

@@ -27,9 +27,7 @@ use primitives::traits::{As, Zero};
 use timestamp::OnTimestampSet;
 #[cfg(feature = "std")]
 use timestamp::TimestampInherentData;
-#[cfg(feature = "std")]
-use parity_codec::Decode;
-use parity_codec_derive::{Encode, Decode};
+use parity_codec::{Encode, Decode};
 use inherents::{RuntimeString, InherentIdentifier, InherentData, ProvideInherent, MakeFatalError};
 #[cfg(feature = "std")]
 use inherents::{InherentDataProviders, ProvideInherentData};

substrate/srml/balances/Cargo.toml

@@ -8,8 +8,7 @@ edition = "2018"
 hex-literal = "0.1.0"
 serde = { version = "1.0", default-features = false }
 safe-mix = { version = "1.0", default-features = false}
-parity-codec = { version = "3.1", default-features = false }
-parity-codec-derive = { version = "3.1", default-features = false }
+parity-codec = { version = "3.1", default-features = false, features = ["derive"] }
 substrate-keyring = { path = "../../core/keyring", optional = true }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false }
@@ -27,7 +26,6 @@ std = [
 	"safe-mix/std",
 	"substrate-keyring",
 	"parity-codec/std",
-	"parity-codec-derive/std",
 	"rstd/std",
 	"srml-support/std",
 	"primitives/std",

substrate/srml/balances/src/lib.rs

@@ -26,8 +26,7 @@
 
 use rstd::prelude::*;
 use rstd::{cmp, result};
-use parity_codec::Codec;
-use parity_codec_derive::{Encode, Decode};
+use parity_codec::{Codec, Encode, Decode};
 use srml_support::{StorageValue, StorageMap, Parameter, decl_event, decl_storage, decl_module, ensure};
 use srml_support::traits::{
 	UpdateBalanceOutcome, Currency, EnsureAccountLiquid, OnFreeBalanceZero, TransferAsset, WithdrawReason, ArithmeticType

substrate/srml/consensus/Cargo.toml

@@ -8,8 +8,7 @@ edition = "2018"
 hex-literal = "0.1.0"
 serde = { version = "1.0", default-features = false }
 serde_derive = { version = "1.0", optional = true }
-parity-codec = { version = "3.1", default-features = false }
-parity-codec-derive = { version = "3.1", default-features = false }
+parity-codec = { version = "3.1", default-features = false, features = ["derive"] }
 substrate-primitives = { path = "../../core/primitives", default-features = false }
 inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }

substrate/srml/consensus/src/lib.rs

@@ -22,8 +22,7 @@
 use serde_derive::Serialize;
 use rstd::prelude::*;
 use parity_codec as codec;
-use codec::Encode;
-use parity_codec_derive::{Encode, Decode};
+use codec::{Encode, Decode};
 use srml_support::{storage, Parameter, decl_storage, decl_module};
 use srml_support::storage::StorageValue;
 use srml_support::storage::unhashed::StorageVec;

substrate/srml/contract/Cargo.toml

@@ -8,8 +8,7 @@ edition = "2018"
 serde = { version = "1.0", default-features = false }
 serde_derive = { version = "1.0", optional = true }
 pwasm-utils = { version = "0.6.1", default-features = false }
-parity-codec = { version = "3.1", default-features = false }
-parity-codec-derive = { version = "3.1", default-features = false }
+parity-codec = { version = "3.1", default-features = false, features = ["derive"] }
 parity-wasm = { version = "0.31", default-features = false }
 substrate-primitives = { path = "../../core/primitives", default-features = false }
 runtime-primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false }
@@ -34,7 +33,6 @@ std = [
 	"serde/std",
 	"serde_derive",
 	"parity-codec/std",
-	"parity-codec-derive/std",
 	"substrate-primitives/std",
 	"runtime-primitives/std",
 	"runtime-io/std",

substrate/srml/contract/src/lib.rs

@@ -69,8 +69,7 @@ use crate::account_db::AccountDb;
 use serde_derive::{Serialize, Deserialize};
 use rstd::prelude::*;
 use rstd::marker::PhantomData;
-use parity_codec::{Codec, Encode};
-use parity_codec_derive::{Encode, Decode};
+use parity_codec::{Codec, Encode, Decode};
 use runtime_primitives::traits::{Hash, As, SimpleArithmetic,Bounded, StaticLookup};
 use srml_support::dispatch::{Result, Dispatchable};
 use srml_support::{Parameter, StorageMap, StorageValue, StorageDoubleMap, decl_module, decl_event, decl_storage};

substrate/srml/contract/src/wasm/mod.rs

@@ -23,7 +23,7 @@ use crate::exec::{Ext, EmptyOutputBuf, VmExecResult};
 use crate::gas::GasMeter;
 
 use rstd::prelude::*;
-use parity_codec_derive::{Encode, Decode};
+use parity_codec::{Encode, Decode};
 use sandbox;
 
 #[macro_use]

substrate/srml/democracy/Cargo.toml

@@ -9,8 +9,7 @@ hex-literal = "0.1.0"
 serde = { version = "1.0", default-features = false }
 serde_derive = { version = "1.0", optional = true }
 safe-mix = { version = "1.0", default-features = false}
-parity-codec = { version = "3.1", default-features = false }
-parity-codec-derive = { version = "3.1", default-features = false }
+parity-codec = { version = "3.1", default-features = false, features = ["derive"] }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
 primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false }

substrate/srml/democracy/src/lib.rs

@@ -21,7 +21,7 @@
 use rstd::prelude::*;
 use rstd::result;
 use primitives::traits::{Zero, As};
-use parity_codec_derive::{Encode, Decode};
+use parity_codec::{Encode, Decode};
 use srml_support::{StorageValue, StorageMap, Parameter, Dispatchable, IsSubType};
 use srml_support::{decl_module, decl_storage, decl_event, ensure};
 use srml_support::traits::{Currency, OnFreeBalanceZero, EnsureAccountLiquid, WithdrawReason, ArithmeticType};

substrate/srml/democracy/src/vote_threshold.rs

@@ -18,7 +18,7 @@
 
 #[cfg(feature = "std")]
 use serde_derive::{Serialize, Deserialize};
-use parity_codec_derive::{Encode, Decode};
+use parity_codec::{Encode, Decode};
 use primitives::traits::{Zero, IntegerSquareRoot};
 use rstd::ops::{Add, Mul, Div, Rem};
 

substrate/srml/grandpa/Cargo.toml

@@ -8,8 +8,7 @@ edition = "2018"
 #hex-literal = "0.1.0"
 serde = { version = "1.0", default-features = false }
 serde_derive = { version = "1.0", optional = true }
-parity-codec = { version = "3.1", default-features = false }
-parity-codec-derive = { version = "3.1", default-features = false }
+parity-codec = { version = "3.1", default-features = false, features = ["derive"] }
 substrate-primitives = { path = "../../core/primitives", default-features = false }
 substrate-finality-grandpa-primitives = { path = "../../core/finality-grandpa/primitives", default-features = false }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }

substrate/srml/grandpa/src/lib.rs

@@ -34,7 +34,7 @@ pub use substrate_finality_grandpa_primitives as fg_primitives;
 use serde_derive::Serialize;
 use rstd::prelude::*;
 use parity_codec as codec;
-use parity_codec_derive::{Encode, Decode};
+use codec::{Encode, Decode};
 use fg_primitives::ScheduledChange;
 use srml_support::{Parameter, decl_event, decl_storage, decl_module};
 use srml_support::dispatch::Result;

substrate/srml/grandpa/src/mock.rs

@@ -23,8 +23,7 @@ use primitives::generic::DigestItem as GenDigestItem;
 use runtime_io;
 use srml_support::{impl_outer_origin, impl_outer_event};
 use substrate_primitives::{H256, Blake2Hasher};
-use parity_codec::Encode;
-use parity_codec_derive::{Encode, Decode};
+use parity_codec::{Encode, Decode};
 use crate::{GenesisConfig, Trait, Module, RawLog};
 
 impl_outer_origin!{

substrate/srml/metadata/Cargo.toml

@@ -5,8 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-parity-codec = { version = "3.1", default-features = false }
-parity-codec-derive = { version = "3.1", default-features = false }
+parity-codec = { version = "3.1", default-features = false, features = ["derive"] }
 serde = { version = "1.0", optional = true }
 serde_derive = { version = "1.0", optional = true }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
@@ -16,7 +15,6 @@ primitives = { package = "substrate-primitives", path = "../../core/primitives",
 default = ["std"]
 std = [
 	"parity-codec/std",
-	"parity-codec-derive/std",
 	"rstd/std",
 	"primitives/std",
 	"serde",

substrate/srml/metadata/src/lib.rs

@@ -26,10 +26,7 @@
 use serde_derive::Serialize;
 #[cfg(feature = "std")]
 use parity_codec::{Decode, Input};
-#[cfg(feature = "std")]
-use parity_codec_derive::Decode;
 use parity_codec::{Encode, Output};
-use parity_codec_derive::Encode;
 use rstd::vec::Vec;
 
 #[cfg(feature = "std")]

substrate/srml/staking/Cargo.toml

@@ -8,8 +8,7 @@ edition = "2018"
 hex-literal = "0.1.0"
 serde = { version = "1.0", default-features = false }
 safe-mix = { version = "1.0", default-features = false}
-parity-codec = { version = "3.1", default-features = false }
-parity-codec-derive = { version = "3.1", default-features = false }
+parity-codec = { version = "3.1", default-features = false, features = ["derive"] }
 substrate-keyring = { path = "../../core/keyring", optional = true }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false }
@@ -31,7 +30,6 @@ std = [
 	"safe-mix/std",
 	"substrate-keyring",
 	"parity-codec/std",
-	"parity-codec-derive/std",
 	"rstd/std",
 	"srml-support/std",
 	"primitives/std",

substrate/srml/staking/src/lib.rs

@@ -21,8 +21,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use rstd::{prelude::*, result};
-use parity_codec::HasCompact;
-use parity_codec_derive::{Encode, Decode};
+use parity_codec::{HasCompact, Encode, Decode};
 use srml_support::{StorageValue, StorageMap, EnumerableStorageMap, dispatch::Result};
 use srml_support::{decl_module, decl_event, decl_storage, ensure};
 use srml_support::traits::{

substrate/srml/support/Cargo.toml

@@ -8,8 +8,7 @@ edition = "2018"
 hex-literal = { version = "0.1.0", optional = true }
 serde = { version = "1.0", default-features = false }
 serde_derive = { version = "1.0", optional = true }
-parity-codec = { version = "3.1", default-features = false }
-parity-codec-derive = { version = "3.1", default-features = false }
+parity-codec = { version = "3.1", default-features = false, features = ["derive"] }
 srml-metadata = { path = "../metadata", default-features = false }
 sr-std = { path = "../../core/sr-std", default-features = false }
 runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }

substrate/srml/support/procedural/src/storage/impls.rs

@@ -217,7 +217,7 @@ impl<'a> Impls<'a> {
 		// generator for linked map
 		let helpers = quote! {
 			/// Linkage data of an element (it's successor and predecessor)
-			#[derive(#scrate::parity_codec_derive::Encode, #scrate::parity_codec_derive::Decode)]
+			#[derive(#scrate::codec::Encode, #scrate::codec::Decode)]
 			pub(crate) struct #linkage<Key> {
 				/// Previous element key in storage (None for the first element)
 				pub previous: Option<Key>,

substrate/srml/support/src/event.rs

@@ -26,9 +26,8 @@ pub use srml_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnEn
 /// ```rust
 /// #[macro_use]
 /// extern crate srml_support;
-/// extern crate parity_codec as codec;
 /// #[macro_use]
-/// extern crate parity_codec_derive;
+/// extern crate parity_codec as codec;
 /// #[macro_use]
 /// extern crate serde_derive;
 ///
@@ -48,7 +47,7 @@ pub use srml_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnEn
 /// extern crate srml_support;
 /// extern crate parity_codec as codec;
 /// #[macro_use]
-/// extern crate parity_codec_derive;
+/// extern crate parity_codec;
 /// #[macro_use]
 /// extern crate serde_derive;
 ///
@@ -111,7 +110,7 @@ macro_rules! decl_event {
 		}
 	) => {
 		// Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.
-		#[derive(Clone, PartialEq, Eq, $crate::parity_codec_derive::Encode, $crate::parity_codec_derive::Decode)]
+		#[derive(Clone, PartialEq, Eq, $crate::codec::Encode, $crate::codec::Decode)]
 		#[cfg_attr(feature = "std", derive(Debug))]
 		$(#[$attr])*
 		pub enum Event {
@@ -230,7 +229,7 @@ macro_rules! __decl_generic_event {
 	) => {
 		pub type Event<$event_generic_param> = RawEvent<$( $generic_type ),*>;
 		// Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.
-		#[derive(Clone, PartialEq, Eq, $crate::parity_codec_derive::Encode, $crate::parity_codec_derive::Decode)]
+		#[derive(Clone, PartialEq, Eq, $crate::codec::Encode, $crate::codec::Decode)]
 		#[cfg_attr(feature = "std", derive(Debug))]
 		$(#[$attr])*
 		pub enum RawEvent<$( $generic_param ),*> {
@@ -373,7 +372,7 @@ macro_rules! impl_outer_event {
 		$( $module_name:ident::Event $( <$generic_param:ident> )*, )*;
 	) => {
 		// Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.
-		#[derive(Clone, PartialEq, Eq, $crate::parity_codec_derive::Encode, $crate::parity_codec_derive::Decode)]
+		#[derive(Clone, PartialEq, Eq, $crate::codec::Encode, $crate::codec::Decode)]
 		#[cfg_attr(feature = "std", derive(Debug))]
 		$(#[$attr])*
 		#[allow(non_camel_case_types)]
@@ -452,7 +451,7 @@ macro_rules! __impl_outer_event_json_metadata {
 mod tests {
 	use super::*;
 	use serde_derive::Serialize;
-	use parity_codec_derive::{Encode, Decode};
+	use parity_codec::{Encode, Decode};
 
 	mod system {
 		pub trait Trait {

substrate/srml/support/src/lib.rs

@@ -25,8 +25,6 @@ pub use serde;
 pub use sr_std as rstd;
 #[doc(hidden)]
 pub use parity_codec as codec;
-#[doc(hidden)]
-pub use parity_codec_derive;
 #[cfg(feature = "std")]
 #[doc(hidden)]
 pub use once_cell;

substrate/srml/support/src/metadata.rs

@@ -239,8 +239,6 @@ mod tests {
 		ModuleMetadata, RuntimeMetadataPrefixed
 	};
 	use crate::codec::{Encode, Decode};
-	use parity_codec_derive::{Decode, Encode};
-
 
 	mod system {
 		pub trait Trait {

substrate/srml/system/Cargo.toml

@@ -9,8 +9,7 @@ hex-literal = "0.1.0"
 serde = { version = "1.0", default-features = false }
 serde_derive = { version = "1.0", optional = true }
 safe-mix = { version = "1.0", default-features = false}
-parity-codec = { version = "3.1", default-features = false }
-parity-codec-derive = { version = "3.1", default-features = false }
+parity-codec = { version = "3.1", default-features = false, features = ["derive"] }
 substrate-primitives = { path = "../../core/primitives", default-features = false }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
@@ -24,7 +23,6 @@ std = [
 	"serde_derive",
 	"safe-mix/std",
 	"parity-codec/std",
-	"parity-codec-derive/std",
 	"substrate-primitives/std",
 	"rstd/std",
 	"runtime_io/std",

substrate/srml/system/src/lib.rs

@@ -30,10 +30,7 @@ use primitives::traits::{self, CheckEqual, SimpleArithmetic, SimpleBitOps, Zero,
 use substrate_primitives::storage::well_known_keys;
 use srml_support::{storage, StorageValue, StorageMap, Parameter, decl_module, decl_event, decl_storage};
 use safe_mix::TripletMix;
-use parity_codec_derive::{Encode, Decode};
-
-#[cfg(any(feature = "std", test))]
-use parity_codec::Encode;
+use parity_codec::{Encode, Decode};
 
 #[cfg(any(feature = "std", test))]
 use runtime_io::{twox_128, TestExternalities, Blake2Hasher};

substrate/srml/timestamp/Cargo.toml

@@ -7,8 +7,7 @@ edition = "2018"
 [dependencies]
 hex-literal = "0.1.0"
 serde = { version = "1.0", default-features = false }
-parity-codec = { version = "3.1", default-features = false }
-parity-codec-derive = { version = "3.1", default-features = false }
+parity-codec = { version = "3.1", default-features = false, features = ["derive"] }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 runtime_primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false }
 inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false }
@@ -29,7 +28,6 @@ std = [
 	"consensus/std",
 	"serde/std",
 	"parity-codec/std",
-	"parity-codec-derive/std",
 	"system/std",
 	"inherents/std",
 ]

substrate/srml/timestamp/src/lib.rs

@@ -33,8 +33,8 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[cfg(feature = "std")]
-use parity_codec_derive::Decode;
-use parity_codec_derive::Encode;
+use parity_codec::Decode;
+use parity_codec::Encode;
 use srml_support::{StorageValue, Parameter, decl_storage, decl_module};
 use srml_support::for_each_tuple;
 use runtime_primitives::traits::{As, SimpleArithmetic, Zero};

substrate/srml/treasury/Cargo.toml

@@ -8,8 +8,7 @@ edition = "2018"
 hex-literal = "0.1.0"
 serde = { version = "1.0", default-features = false }
 serde_derive = { version = "1.0", optional = true }
-parity-codec = { version = "3.1", default-features = false }
-parity-codec-derive = { version = "3.1", default-features = false }
+parity-codec = { version = "3.1", default-features = false, features = ["derive"] }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 runtime_primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false }
 srml-support = { path = "../support", default-features = false }
@@ -26,7 +25,6 @@ std = [
 	"serde/std",
 	"serde_derive",
 	"parity-codec/std",
-	"parity-codec-derive/std",
 	"rstd/std",
 	"runtime_primitives/std",
 	"srml-support/std",

substrate/srml/treasury/src/lib.rs

@@ -24,7 +24,7 @@ use rstd::prelude::*;
 use srml_support::{StorageValue, StorageMap, decl_module, decl_storage, decl_event, ensure};
 use srml_support::traits::{Currency, OnDilution, ArithmeticType};
 use runtime_primitives::{Permill, traits::{Zero, EnsureOrigin, StaticLookup}};
-use parity_codec_derive::{Encode, Decode};
+use parity_codec::{Encode, Decode};
 use system::ensure_signed;
 
 type BalanceOf<T> = <<T as Trait>::Currency as ArithmeticType>::Type;