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
This commit is contained in:
Hero Bird
2019-03-05 09:00:37 +01:00
committed by Bastian Köcher
parent 755b53bd05
commit 128d164f2b
85 changed files with 88 additions and 221 deletions
@@ -23,8 +23,7 @@ use std::fmt;
use serde_derive::Serialize;
use rstd::prelude::*;
use parity_codec_derive::{Encode, Decode};
use crate::codec::Codec;
use crate::codec::{Codec, Encode, Decode};
use crate::traits::{self, Member, Block as BlockT, Header as HeaderT, MaybeSerialize};
use crate::Justification;
@@ -20,7 +20,6 @@
use serde_derive::Serialize;
use rstd::prelude::*;
use parity_codec_derive::{Encode, Decode};
use crate::codec::{Decode, Encode, Codec, Input};
use crate::traits::{self, Member, DigestItem as DigestItemT, MaybeHash};
@@ -20,7 +20,6 @@
use std::fmt;
use rstd::prelude::*;
use parity_codec_derive::{Encode, Decode};
use crate::codec::{Decode, Encode, Codec, Input, HasCompact};
use crate::traits::{self, Member, SimpleArithmetic, MaybeDisplay, Lookup, Extrinsic};
use super::CheckedExtrinsic;
@@ -190,7 +190,7 @@ impl<Address, Index, Call, Signature> fmt::Debug for UncheckedMortalCompactExtri
mod tests {
use super::*;
use runtime_io::blake2_256;
use parity_codec_derive::{Encode, Decode};
use crate::codec::{Encode, Decode};
use serde_derive::{Serialize, Deserialize};
struct TestContext;
@@ -189,7 +189,7 @@ impl<Address, Index, Call, Signature> fmt::Debug for UncheckedMortalExtrinsic<Ad
mod tests {
use super::*;
use runtime_io::blake2_256;
use parity_codec_derive::{Encode, Decode};
use crate::codec::{Encode, Decode};
use serde_derive::{Serialize, Deserialize};
struct TestContext;
+8 -9
View File
@@ -31,7 +31,7 @@ use std::collections::HashMap;
use rstd::prelude::*;
use substrate_primitives::hash::{H256, H512};
use parity_codec_derive::{Encode, Decode};
use codec::{Encode, Decode};
#[cfg(feature = "std")]
use substrate_primitives::hexdisplay::ascii_format;
@@ -585,8 +585,7 @@ impl traits::Extrinsic for OpaqueExtrinsic {
#[cfg(test)]
mod tests {
use substrate_primitives::hash::H256;
use crate::codec::{Encode as EncodeHidden, Decode as DecodeHidden};
use parity_codec_derive::{Encode, Decode};
use crate::codec::{Encode, Decode};
use crate::traits::DigestItem;
pub trait RuntimeT {
@@ -601,7 +600,7 @@ mod tests {
mod a {
use super::RuntimeT;
use parity_codec_derive::{Encode, Decode};
use crate::codec::{Encode, Decode};
use serde_derive::Serialize;
pub type Log<R> = RawLog<<R as RuntimeT>::AuthorityId>;
@@ -611,7 +610,7 @@ mod tests {
mod b {
use super::RuntimeT;
use parity_codec_derive::{Encode, Decode};
use crate::codec::{Encode, Decode};
use serde_derive::Serialize;
pub type Log<R> = RawLog<<R as RuntimeT>::AuthorityId>;
@@ -630,24 +629,24 @@ mod tests {
// encode/decode regular item
let b1: Log = b::RawLog::B1::<u64>(777).into();
let encoded_b1 = b1.encode();
let decoded_b1: Log = DecodeHidden::decode(&mut &encoded_b1[..]).unwrap();
let decoded_b1: Log = Decode::decode(&mut &encoded_b1[..]).unwrap();
assert_eq!(b1, decoded_b1);
// encode/decode system item
let auth_change: Log = a::RawLog::AuthoritiesChange::<u64>(vec![100, 200, 300]).into();
let encoded_auth_change = auth_change.encode();
let decoded_auth_change: Log = DecodeHidden::decode(&mut &encoded_auth_change[..]).unwrap();
let decoded_auth_change: Log = Decode::decode(&mut &encoded_auth_change[..]).unwrap();
assert_eq!(auth_change, decoded_auth_change);
// interpret regular item using `generic::DigestItem`
let generic_b1: super::generic::DigestItem<H256, u64> = DecodeHidden::decode(&mut &encoded_b1[..]).unwrap();
let generic_b1: super::generic::DigestItem<H256, u64> = Decode::decode(&mut &encoded_b1[..]).unwrap();
match generic_b1 {
super::generic::DigestItem::Other(_) => (),
_ => panic!("unexpected generic_b1: {:?}", generic_b1),
}
// interpret system item using `generic::DigestItem`
let generic_auth_change: super::generic::DigestItem<H256, u64> = DecodeHidden::decode(&mut &encoded_auth_change[..]).unwrap();
let generic_auth_change: super::generic::DigestItem<H256, u64> = Decode::decode(&mut &encoded_auth_change[..]).unwrap();
match generic_auth_change {
super::generic::DigestItem::AuthoritiesChange::<H256, u64>(authorities) => assert_eq!(authorities, vec![100, 200, 300]),
_ => panic!("unexpected generic_auth_change: {:?}", generic_auth_change),
+1 -2
View File
@@ -24,13 +24,12 @@ use std::{fmt::Debug, ops::Deref, fmt};
use crate::codec::{Codec, Encode, Decode};
use crate::traits::{self, Checkable, Applyable, BlakeTwo256, Convert};
use crate::generic::DigestItem as GenDigestItem;
use parity_codec_derive::{Encode, Decode};
pub use substrate_primitives::{H256, Ed25519AuthorityId};
use substrate_primitives::U256;
/// Authority Id
#[derive(Default, PartialEq, Eq, Clone, Decode, Encode, Debug)]
#[derive(Default, PartialEq, Eq, Clone, Encode, Decode, Debug)]
#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
pub struct UintAuthorityId(pub u64);
impl Into<Ed25519AuthorityId> for UintAuthorityId {
@@ -17,7 +17,7 @@
//! Transaction validity interface.
use rstd::prelude::*;
use parity_codec_derive::{Encode, Decode};
use crate::codec::{Encode, Decode};
/// Priority for a transaction. Additive. Higher is better.
pub type TransactionPriority = u64;