Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Commit

Permalink
Encode primative types using enum instead of string
Browse files Browse the repository at this point in the history
  • Loading branch information
@xlc
xlc committed Jan 2, 2019
1 parent 350821d commit 1446c3b
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 26 deletions.
1 change: 0 additions & 1 deletion core/metadata-derive/src/encode.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ pub fn quote(data: &Data, type_name: &Ident) -> TokenStream {
};
quote! {
_substrate_metadata::Metadata {
name: stringify!(#type_name).into(),
kind: #res
}
}
Expand Down
60 changes: 43 additions & 17 deletions core/metadata/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,48 @@ pub struct EnumVariantMetadata {
pub fields: Vec<FieldMetadata>
}

#[derive(Encode, Clone, PartialEq, Eq)]
#[cfg_attr(feature = "std", derive(Decode, Debug, Serialize))]
pub enum PrimativeMetadata {
Unknown,
Unit,
PhantomData, // do we need this or it can just be Unit?
Bool,
Usize, Isize,
U8, I8,
U16, I16,
U32, I32,
U64, I64,
U128, I128,
}

impl From<&str> for PrimativeMetadata {
fn from(x: &str) -> PrimativeMetadata {
match x {
"Unit" => PrimativeMetadata::Unit,
"PhantomData" => PrimativeMetadata::PhantomData,
"bool" => PrimativeMetadata::Bool,
"usize" => PrimativeMetadata::Usize,
"isize" => PrimativeMetadata::Isize,
"u8" => PrimativeMetadata::U8,
"i8" => PrimativeMetadata::I8,
"u16" => PrimativeMetadata::U16,
"i16" => PrimativeMetadata::I16,
"u32" => PrimativeMetadata::U32,
"i32" => PrimativeMetadata::I32,
"u64" => PrimativeMetadata::U64,
"i64" => PrimativeMetadata::I64,
"u128" => PrimativeMetadata::U128,
"i128" => PrimativeMetadata::I128,
_ => PrimativeMetadata::Unknown, // panic! can make it runtime error but how to make this compile-time error?
}
}
}

#[derive(Encode, Clone, PartialEq, Eq)]
#[cfg_attr(feature = "std", derive(Decode, Debug, Serialize))]
pub enum TypeMetadata {
Primative,
Primative(PrimativeMetadata),
Array(u32, Box<Metadata>),
Vector(Box<Metadata>),
Struct(Vec<FieldMetadata>),
Expand All @@ -57,15 +95,13 @@ pub enum TypeMetadata {
#[derive(Clone, PartialEq, Eq)]
#[cfg_attr(feature = "std", derive(Decode, Debug, Serialize))]
pub struct Metadata {
pub name: StringBuf,
pub kind: TypeMetadata
}

pub trait EncodeMetadata {
fn type_metadata() -> Metadata {
Metadata {
name: "<Unknown>".into(),
kind: TypeMetadata::Primative
kind: TypeMetadata::Primative(PrimativeMetadata::Unknown)
}
}
}
Expand All @@ -75,8 +111,7 @@ macro_rules! impl_primatives {
impl EncodeMetadata for $t {
fn type_metadata() -> Metadata {
Metadata {
name: stringify!($t).into(),
kind: TypeMetadata::Primative
kind: TypeMetadata::Primative(stringify!($t).into())
}
}
}
Expand All @@ -91,7 +126,6 @@ macro_rules! impl_array {
impl<T: EncodeMetadata> EncodeMetadata for [T; $n] {
fn type_metadata() -> Metadata {
Metadata {
name: "Array".into(),
kind: TypeMetadata::Array($n, Box::new(T::type_metadata()))
}
}
Expand All @@ -105,7 +139,6 @@ impl_array!(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
impl<T: EncodeMetadata> EncodeMetadata for Vec<T> {
fn type_metadata() -> Metadata {
Metadata {
name: "Vec".into(),
kind: TypeMetadata::Vector(Box::new(T::type_metadata()))
}
}
Expand All @@ -114,7 +147,6 @@ impl<T: EncodeMetadata> EncodeMetadata for Vec<T> {
impl<T: EncodeMetadata> EncodeMetadata for Option<T> {
fn type_metadata() -> Metadata {
Metadata {
name: "Option".into(),
kind: TypeMetadata::Enum(vec![
EnumVariantMetadata {
name: "None".into(),
Expand All @@ -139,7 +171,6 @@ impl<T: EncodeMetadata> EncodeMetadata for Option<T> {
impl<T: EncodeMetadata, E: EncodeMetadata> EncodeMetadata for Result<T, E> {
fn type_metadata() -> Metadata {
Metadata {
name: "Result".into(),
kind: TypeMetadata::Enum(vec![
EnumVariantMetadata {
name: "Ok".into(),
Expand Down Expand Up @@ -195,7 +226,6 @@ macro_rules! tuple_impl {
impl<$one: EncodeMetadata> EncodeMetadata for ($one,) {
fn type_metadata() -> Metadata {
Metadata {
name: "Tuple".into(),
kind: TypeMetadata::Tuple(vec![
<$one>::type_metadata(),
]),
Expand All @@ -209,7 +239,6 @@ macro_rules! tuple_impl {
($first, $($rest),+) {
fn type_metadata() -> Metadata {
Metadata {
name: "Tuple".into(),
kind: TypeMetadata::Tuple(vec![
<$first>::type_metadata(),
$( <$rest>::type_metadata(), )+
Expand All @@ -227,17 +256,15 @@ tuple_impl!(A, B, C, D, E, F, G, H, I, J, K,);
impl<T: EncodeMetadata> EncodeMetadata for ::rstd::marker::PhantomData<T> {
fn type_metadata() -> Metadata {
Metadata {
name: "PhantomData".into(),
kind: TypeMetadata::Primative
kind: TypeMetadata::Primative(PrimativeMetadata::PhantomData)
}
}
}

impl EncodeMetadata for () {
fn type_metadata() -> Metadata {
Metadata {
name: "Unit".into(),
kind: TypeMetadata::Primative
kind: TypeMetadata::Primative(PrimativeMetadata::Unit)
}
}
}
Expand Down Expand Up @@ -267,7 +294,6 @@ impl parity_codec::Encode for EnumVariantMetadata {

impl parity_codec::Encode for Metadata {
fn encode_to<EncOut: parity_codec::Output>(&self, dest: &mut EncOut) {
dest.push(&self.name.as_bytes());
dest.push(&self.kind);
}
}
5 changes: 1 addition & 4 deletions core/primitives/src/hash.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,7 @@ macro_rules! impl_rest {

impl ::substrate_metadata::EncodeMetadata for $name {
fn type_metadata() -> ::substrate_metadata::Metadata {
::substrate_metadata::Metadata {
name: stringify!($name).into(),
kind: ::substrate_metadata::TypeMetadata::Primative
}
<[u8; $len] as ::substrate_metadata::EncodeMetadata>::type_metadata()
}
}

Expand Down
4 changes: 2 additions & 2 deletions core/sr-primitives/src/generic/digest.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,9 @@ impl<'a, Hash: Encode, AuthorityId: Encode> Encode for DigestItemRef<'a, Hash, A

impl<'a, Hash: EncodeMetadata, AuthorityId: EncodeMetadata> EncodeMetadata for DigestItemRef<'a, Hash, AuthorityId> {
fn type_metadata() -> substrate_metadata::Metadata {
// TODO: implement this
substrate_metadata::Metadata {
name: "DigestItemRef".into(),
kind: substrate_metadata::TypeMetadata::Primative // TODO: implement this
kind: substrate_metadata::TypeMetadata::Primative(substrate_metadata::PrimativeMetadata::Unknown)
}
}
}
4 changes: 2 additions & 2 deletions core/sr-primitives/src/generic/header.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ impl<Number, Hash, DigestItem> substrate_metadata::EncodeMetadata for Header<Num
DigestItem: DigestItemT + Encode,
{
fn type_metadata() -> substrate_metadata::Metadata {
// TODO: implement this
substrate_metadata::Metadata {
name: "Header".into(),
kind: substrate_metadata::TypeMetadata::Primative // TODO: implement this
kind: substrate_metadata::TypeMetadata::Primative(substrate_metadata::PrimativeMetadata::Unknown)
}
}
}
Expand Down
Binary file modified node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm
View file
Binary file not shown.

0 comments on commit 1446c3b

Please sign in to comment.