Skip to content

Aj metadata vnext #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulormart merged 12 commits into from
Oct 22, 2021
Merged

Aj metadata vnext #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
398c63c
Derive AsCompact for structs with single concrete unsigned int field
ascjones Oct 21, 2021
192fa39
Fix bitvec codegen, adds as non optional dependency
ascjones Oct 21, 2021
adf8ebd
Regenerate polkadot api with bitvec fix
ascjones Oct 21, 2021
e430d1b
Edition 2021
ascjones Oct 21, 2021
90312bd
Fix polkadot codegen with bitvec
ascjones Oct 22, 2021
b2d04bb
Polkadot balance transfer is working
ascjones Oct 22, 2021
d1566e8
Fix fetch remote
ascjones Oct 22, 2021
927aa00
Fix transfer_subscribe example
ascjones Oct 22, 2021
b26cd2f
Fix submit_and_watch example
ascjones Oct 22, 2021
091b255
Fmt
ascjones Oct 22, 2021
cdb881e
Generate storage iter method for iterating over keys
ascjones Oct 22, 2021
da71f69
Fmt
ascjones Oct 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Derive AsCompact for structs with single concrete unsigned int field
  • Loading branch information
@ascjones
ascjones committed Oct 21, 2021
commit 398c63c7b0bb4372ab49856f40c0f7957adfa90c
159 changes: 144 additions & 15 deletions codegen/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,37 @@ impl<'a> quote::ToTokens for ModuleType<'a> {
let type_name = type_name.expect("structs should have a name");
let (fields, _) =
self.composite_fields(composite.fields(), &type_params, true);
let derive_as_compact = if composite.fields().len() == 1 {
// any single field wrapper struct with a concrete unsigned int type can derive
// CompactAs.
let field = &composite.fields()[0];
if !self.ty.type_params()
.iter()
.any(|tp| Some(tp.name()) == field.type_name())
{
let ty = self.type_gen.resolve_type(field.ty().id());
if matches!(
ty.type_def(),
TypeDef::Primitive(
TypeDefPrimitive::U8
| TypeDefPrimitive::U16
| TypeDefPrimitive::U32
| TypeDefPrimitive::U64
| TypeDefPrimitive::U128
)
) {
Some(quote!( , ::codec::CompactAs ))
} else {
None
}
} else {
None
}
} else {
None
};
let ty_toks = quote! {
#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode)]
#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode #derive_as_compact)]
pub struct #type_name #fields
};
tokens.extend(ty_toks);
Expand Down Expand Up @@ -410,7 +439,7 @@ impl<'a> ModuleType<'a> {
if is_struct && !unused_params.is_empty() {
let phantom = Self::phantom_data(&unused_params);
fields_tokens.push(quote! {
pub __subxt_unused_type_params: #phantom
#[codec(skip)] pub __subxt_unused_type_params: #phantom
})
}

Expand Down Expand Up @@ -454,7 +483,7 @@ impl<'a> ModuleType<'a> {

if is_struct && !unused_params.is_empty() {
let phantom_data = Self::phantom_data(&unused_params);
fields_tokens.push(quote! { pub #phantom_data })
fields_tokens.push(quote! { #[codec(skip)] pub #phantom_data })
}

let fields = quote! { ( #( #fields_tokens, )* ) };
Expand Down Expand Up @@ -703,8 +732,7 @@ mod tests {
TypeInfo,
};

const MOD_PATH: &'static [&'static str] =
&["chameleon_core", "generate_types", "tests"];
const MOD_PATH: &'static [&'static str] = &["subxt_codegen", "types", "tests"];

fn get_mod<'a>(
module: &'a Module,
Expand Down Expand Up @@ -793,7 +821,7 @@ mod tests {
#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode)]
pub struct Parent {
pub a: bool,
pub b: root::chameleon_core::generate_types::tests::Child,
pub b: root::subxt_codegen::types::tests::Child,
}
}
}
Expand Down Expand Up @@ -829,13 +857,114 @@ mod tests {
pub struct Child(pub i32,);

#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode)]
pub struct Parent(pub bool, pub root::chameleon_core::generate_types::tests::Child,);
pub struct Parent(pub bool, pub root::subxt_codegen::types::tests::Child,);
}
}
.to_string()
)
}

#[test]
fn derive_compact_as_for_uint_wrapper_structs() {
#[allow(unused)]
#[derive(TypeInfo)]
struct Su8 {
a: u8,
}
#[allow(unused)]
#[derive(TypeInfo)]
struct TSu8(u8);
#[allow(unused)]
#[derive(TypeInfo)]
struct Su16 {
a: u16,
}
#[allow(unused)]
#[derive(TypeInfo)]
struct TSu16(u16);
#[allow(unused)]
#[derive(TypeInfo)]
struct Su32 {
a: u32,
}
#[allow(unused)]
#[derive(TypeInfo)]
struct TSu32(u32);
#[allow(unused)]
#[derive(TypeInfo)]
struct Su64 {
a: u64,
}
#[allow(unused)]
#[derive(TypeInfo)]
struct TSu64(u64);
#[allow(unused)]
#[derive(TypeInfo)]
struct Su128 {
a: u128,
}
#[allow(unused)]
#[derive(TypeInfo)]
struct TSu128(u128);

let mut registry = Registry::new();
registry.register_type(&meta_type::<Su8>());
registry.register_type(&meta_type::<TSu8>());
registry.register_type(&meta_type::<Su16>());
registry.register_type(&meta_type::<TSu16>());
registry.register_type(&meta_type::<Su32>());
registry.register_type(&meta_type::<TSu32>());
registry.register_type(&meta_type::<Su64>());
registry.register_type(&meta_type::<TSu64>());
registry.register_type(&meta_type::<Su128>());
registry.register_type(&meta_type::<TSu128>());
let portable_types: PortableRegistry = registry.into();

let type_gen = TypeGenerator::new(&portable_types, "root", Default::default());
let types = type_gen.generate_types_mod();
let tests_mod = get_mod(&types, MOD_PATH).unwrap();

assert_eq!(
tests_mod.into_token_stream().to_string(),
quote! {
pub mod tests {
use super::root;

#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode, ::codec::CompactAs)]
pub struct Su128 { pub a: u128, }

#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode, ::codec::CompactAs)]
pub struct Su16 { pub a: u16, }

#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode, ::codec::CompactAs)]
pub struct Su32 { pub a: u32, }

#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode, ::codec::CompactAs)]
pub struct Su64 { pub a: u64, }

#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode, ::codec::CompactAs)]
pub struct Su8 { pub a: u8, }

#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode, ::codec::CompactAs)]
pub struct TSu128(pub u128,);

#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode, ::codec::CompactAs)]
pub struct TSu16(pub u16,);

#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode, ::codec::CompactAs)]
pub struct TSu32(pub u32,);

#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode, ::codec::CompactAs)]
pub struct TSu64(pub u64,);

#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode, ::codec::CompactAs)]
pub struct TSu8(pub u8,);
}
}
.to_string()
)
}

#[test]
fn generate_enum() {
#[allow(unused)]
Expand Down Expand Up @@ -1070,8 +1199,8 @@ mod tests {
use super::root;
#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode)]
pub struct Bar {
pub b: root::chameleon_core::generate_types::tests::Foo<u32>,
pub c: root::chameleon_core::generate_types::tests::Foo<u8>,
pub b: root::subxt_codegen::types::tests::Foo<u32>,
pub c: root::subxt_codegen::types::tests::Foo<u8>,
}
#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode)]
pub struct Foo<_0> {
Expand Down Expand Up @@ -1113,7 +1242,7 @@ mod tests {
use super::root;
#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode)]
pub struct Bar<_0> {
pub b: root::chameleon_core::generate_types::tests::Foo<_0, u32>,
pub b: root::subxt_codegen::types::tests::Foo<_0, u32>,
}

#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode)]
Expand Down Expand Up @@ -1206,15 +1335,15 @@ mod tests {
quote! {
pub mod tests {
use super::root;
#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode)]
#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode, ::codec::CompactAs)]
pub struct NamedFields<_0> {
pub b: u32,
pub __subxt_unused_type_params: ::core::marker::PhantomData<_0>,
#[codec(skip)] pub __subxt_unused_type_params: ::core::marker::PhantomData<_0>,
}
#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode)]
pub struct UnnamedFields<_0, _1> (
pub (u32, u32,),
pub ::core::marker::PhantomData<(_0, _1)>,
#[codec(skip)] pub ::core::marker::PhantomData<(_0, _1)>,
);
}
}
Expand Down Expand Up @@ -1271,7 +1400,7 @@ mod tests {

#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode)]
pub struct Bar {
pub a: root::chameleon_core::generate_types::tests::modules::a::Foo,
pub a: root::subxt_codegen::types::tests::modules::a::Foo,
}
}

Expand All @@ -1284,7 +1413,7 @@ mod tests {

#[derive(Debug, Eq, PartialEq, ::codec::Encode, ::codec::Decode)]
pub struct Foo {
pub a: root::chameleon_core::generate_types::tests::modules::a::b::Bar,
pub a: root::subxt_codegen::types::tests::modules::a::b::Bar,
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/codegen/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
///
/// - run `polkadot --dev --tmp` node locally
/// - `cargo run --release -p subxt-cli -- codegen | rustfmt --edition=2018 --emit=stdout > tests/integration/codegen/polkadot.rs`
mod polkadot;
mod polkadot;
Loading