Ensure opaque extr serialise is same as transparent (#1388)

* Ensure opaque extr serialise is same as transparent

Fixes #889

* Fix wasm compile
This commit is contained in:
Gav Wood
2019-01-11 11:36:44 +01:00
committed by GitHub
parent 9acda28c16
commit 039741c977
2 changed files with 23 additions and 15 deletions
+4 -15
View File
@@ -22,21 +22,18 @@
#![cfg_attr(not(feature = "std"), feature(alloc))]
#[cfg(feature = "std")]
#[macro_use]
extern crate serde_derive;
extern crate serde;
#[macro_use]
extern crate parity_codec_derive;
extern crate parity_codec as codec;
extern crate sr_std as rstd;
extern crate sr_primitives as runtime_primitives;
extern crate substrate_primitives as primitives;
use rstd::prelude::*;
use runtime_primitives::generic;
#[cfg(feature = "std")]
use primitives::bytes;
use runtime_primitives::traits::{BlakeTwo256, self};
use runtime_primitives::{OpaqueExtrinsic, traits::BlakeTwo256};
pub use runtime_primitives::BasicInherentData as InherentData;
@@ -78,12 +75,4 @@ pub type Block = generic::Block<Header, UncheckedExtrinsic>;
pub type BlockId = generic::BlockId<Block>;
/// Opaque, encoded, unchecked extrinsic.
#[derive(PartialEq, Eq, Clone, Default, Encode, Decode)]
#[cfg_attr(feature = "std", derive(Serialize, Debug))]
pub struct UncheckedExtrinsic(#[cfg_attr(feature = "std", serde(with="bytes"))] pub Vec<u8>);
impl traits::Extrinsic for UncheckedExtrinsic {
fn is_signed(&self) -> Option<bool> {
None
}
}
pub type UncheckedExtrinsic = OpaqueExtrinsic;