mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-23 03:47:59 +00:00
Only convert struct names to camel case for Call variant structs (#412)
* Only convert struct names to camel case for `Call` variant structs * Use Cow for transform fn * Use as_ref
This commit is contained in:
@@ -22,7 +22,10 @@ use frame_metadata::{
|
||||
PalletCallMetadata,
|
||||
PalletMetadata,
|
||||
};
|
||||
use heck::SnakeCase as _;
|
||||
use heck::{
|
||||
CamelCase as _,
|
||||
SnakeCase as _,
|
||||
};
|
||||
use proc_macro2::TokenStream as TokenStream2;
|
||||
use proc_macro_error::abort_call_site;
|
||||
use quote::{
|
||||
@@ -37,8 +40,12 @@ pub fn generate_calls(
|
||||
call: &PalletCallMetadata<PortableForm>,
|
||||
types_mod_ident: &syn::Ident,
|
||||
) -> TokenStream2 {
|
||||
let struct_defs =
|
||||
super::generate_structs_from_variants(type_gen, call.ty.id(), "Call");
|
||||
let struct_defs = super::generate_structs_from_variants(
|
||||
type_gen,
|
||||
call.ty.id(),
|
||||
|name| name.to_camel_case().into(),
|
||||
"Call",
|
||||
);
|
||||
let (call_structs, call_fns): (Vec<_>, Vec<_>) = struct_defs
|
||||
.iter()
|
||||
.map(|struct_def| {
|
||||
|
||||
@@ -29,8 +29,12 @@ pub fn generate_events(
|
||||
event: &PalletEventMetadata<PortableForm>,
|
||||
types_mod_ident: &syn::Ident,
|
||||
) -> TokenStream2 {
|
||||
let struct_defs =
|
||||
super::generate_structs_from_variants(type_gen, event.ty.id(), "Event");
|
||||
let struct_defs = super::generate_structs_from_variants(
|
||||
type_gen,
|
||||
event.ty.id(),
|
||||
|name| name.into(),
|
||||
"Event",
|
||||
);
|
||||
let event_structs = struct_defs.iter().map(|struct_def| {
|
||||
let pallet_name = &pallet.name;
|
||||
let event_struct = &struct_def.name;
|
||||
|
||||
@@ -352,19 +352,24 @@ impl RuntimeGenerator {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn generate_structs_from_variants<'a>(
|
||||
pub fn generate_structs_from_variants<'a, F>(
|
||||
type_gen: &'a TypeGenerator,
|
||||
type_id: u32,
|
||||
variant_to_struct_name: F,
|
||||
error_message_type_name: &str,
|
||||
) -> Vec<CompositeDef> {
|
||||
) -> Vec<CompositeDef>
|
||||
where
|
||||
F: Fn(&str) -> std::borrow::Cow<str>,
|
||||
{
|
||||
let ty = type_gen.resolve_type(type_id);
|
||||
if let scale_info::TypeDef::Variant(variant) = ty.type_def() {
|
||||
variant
|
||||
.variants()
|
||||
.iter()
|
||||
.map(|var| {
|
||||
let struct_name = variant_to_struct_name(var.name());
|
||||
let fields = CompositeDefFields::from_scale_info_fields(
|
||||
var.name(),
|
||||
struct_name.as_ref(),
|
||||
var.fields(),
|
||||
&[],
|
||||
type_gen,
|
||||
|
||||
Reference in New Issue
Block a user