Fix conversion of Call struct names to UpperCamelCase (paritytech#441)

* Fix conversion of `Call` struct names to UpperCamelCase

* Update to latest heck and use ToUpperCamelCase

Author: ascjones

codegen/Cargo.toml

@@ -15,7 +15,7 @@ async-trait = "0.1.49"
 codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive", "full", "bit-vec"] }
 darling = "0.13.0"
 frame-metadata = "14.0"
-heck = "0.3.2"
+heck = "0.4.0"
 proc-macro2 = "1.0.24"
 proc-macro-crate = "0.1.5"
 proc-macro-error = "1.0.4"

codegen/src/api/calls.rs

@@ -23,8 +23,8 @@ use frame_metadata::{
     PalletMetadata,
 };
 use heck::{
-    CamelCase as _,
-    SnakeCase as _,
+    ToSnakeCase as _,
+    ToUpperCamelCase as _,
 };
 use proc_macro2::TokenStream as TokenStream2;
 use proc_macro_error::abort_call_site;
@@ -43,7 +43,7 @@ pub fn generate_calls(
     let struct_defs = super::generate_structs_from_variants(
         type_gen,
         call.ty.id(),
-        |name| name.to_camel_case().into(),
+        |name| name.to_upper_camel_case().into(),
         "Call",
     );
     let (call_structs, call_fns): (Vec<_>, Vec<_>) = struct_defs

codegen/src/api/constants.rs

@@ -16,7 +16,7 @@
 
 use crate::types::TypeGenerator;
 use frame_metadata::PalletConstantMetadata;
-use heck::SnakeCase as _;
+use heck::ToSnakeCase as _;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::{
     format_ident,

codegen/src/api/mod.rs

@@ -54,7 +54,7 @@ use frame_metadata::{
     RuntimeMetadataPrefixed,
     StorageEntryType,
 };
-use heck::SnakeCase as _;
+use heck::ToSnakeCase as _;
 use proc_macro2::TokenStream as TokenStream2;
 use proc_macro_error::abort_call_site;
 use quote::{
@@ -462,7 +462,7 @@ where
                     type_gen,
                 );
                 CompositeDef::struct_def(
-                    var.name(),
+                    struct_name.as_ref(),
                     Default::default(),
                     fields,
                     Some(parse_quote!(pub)),

codegen/src/api/storage.rs

@@ -23,7 +23,7 @@ use frame_metadata::{
     StorageEntryType,
     StorageHasher,
 };
-use heck::SnakeCase as _;
+use heck::ToSnakeCase as _;
 use proc_macro2::TokenStream as TokenStream2;
 use proc_macro_error::abort_call_site;
 use quote::{

macro/Cargo.toml

@@ -19,7 +19,7 @@ async-trait = "0.1.49"
 codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive", "full"] }
 darling = "0.13.0"
 frame-metadata = "14.0"
-heck = "0.3.2"
+heck = "0.4.0"
 proc-macro2 = "1.0.24"
 proc-macro-crate = "0.1.5"
 proc-macro-error = "1.0.4"