mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-07-17 08:55:48 +00:00
Metadata V15: Expose API to fetch metadata for version (#13287)
* impl_runtime_apis: Generate getters for `metadata_at` functions Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * runtime: Implement new `Metadata` runtime trait Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * runtime: Move `metadata_at` functions to construct_runtime macro Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * contruct_runtime: Use `OpaqueMetadata` from hidden imports Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Adjust testing Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/tests: Add tests for the new API Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/tests: Adjust metdata naming Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/support: Expose `metadata-v14` feature flag Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/support: Expose metadata only under feature flags Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/support: Expose v14 metadata by default Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/support: Expose metadata feature for testing Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/support: Test metadata under different feature flags Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Update primitives/api/src/lib.rs Co-authored-by: Bastian Köcher <git@kchr.de> * Update primitives/api/src/lib.rs Co-authored-by: Bastian Köcher <git@kchr.de> * client/tests: Adjust testing to reflect trait Metadata change Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/metadata-ir: Add intermediate representation types for metadata Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/metadata-ir: Convert metadata to V14 Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/metadata-ir: Add API to convert metadata to multiple versions Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/metadata-ir: Expose V14 under feature flag Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/support: Adjust to metadata IR Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/support: More adjustments Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/support: Guard v14 details under feature flag Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/support: Adjust testing Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * CI: Ensure `quick-benchmarks` uses `metadata-v14` Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/support: Use `metadata-v14` for benchmarks Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Adjust cargo fmt Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * kitchensink-runtime: Add feature flag for `metadata-v14` Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/support/test: Adjust testing Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/support/test: Check crates locally Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Activate metadata-v14 for pallets Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Remove metadata-v14 feature flag Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/metadata_ir: Move `api.rs` to `mod.rs` Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/support: Handle latest metadata conversion via IR Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/tests: Add constant for metadata version 14 Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/support/test: Fix merge conflict Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Update frame/support/Cargo.toml Co-authored-by: Bastian Köcher <git@kchr.de> * Update frame/support/src/metadata_ir/mod.rs Co-authored-by: Bastian Köcher <git@kchr.de> * Update frame/support/test/Cargo.toml Co-authored-by: Bastian Köcher <git@kchr.de> * Update primitives/api/src/lib.rs Co-authored-by: Bastian Köcher <git@kchr.de> * frame/metadata: Collect pallet documentation for MetadataIR Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/tests: Check pallet documentation is propagated to MetadataIR Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * frame/support: Improve documentation Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> --------- Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> Co-authored-by: parity-processbot <> Co-authored-by: Bastian Köcher <git@kchr.de>
This commit is contained in:
Alexandru Vasile
@@ -27,7 +27,7 @@ fn storage_line_metadata_type(scrate: &TokenStream, line: &StorageLineDefExt) ->
|
||||
match &line.storage_type {
|
||||
StorageLineTypeDef::Simple(_) => {
|
||||
quote! {
|
||||
#scrate::metadata::StorageEntryType::Plain(
|
||||
#scrate::metadata_ir::StorageEntryTypeIR::Plain(
|
||||
#scrate::scale_info::meta_type::<#value_type>()
|
||||
)
|
||||
}
|
||||
@@ -36,8 +36,8 @@ fn storage_line_metadata_type(scrate: &TokenStream, line: &StorageLineDefExt) ->
|
||||
let hasher = map.hasher.into_metadata();
|
||||
let key = &map.key;
|
||||
quote! {
|
||||
#scrate::metadata::StorageEntryType::Map {
|
||||
hashers: #scrate::sp_std::vec! [ #scrate::metadata::#hasher ],
|
||||
#scrate::metadata_ir::StorageEntryTypeIR::Map {
|
||||
hashers: #scrate::sp_std::vec! [ #scrate::metadata_ir::#hasher ],
|
||||
key: #scrate::scale_info::meta_type::<#key>(),
|
||||
value: #scrate::scale_info::meta_type::<#value_type>(),
|
||||
}
|
||||
@@ -49,10 +49,10 @@ fn storage_line_metadata_type(scrate: &TokenStream, line: &StorageLineDefExt) ->
|
||||
let key1 = &map.key1;
|
||||
let key2 = &map.key2;
|
||||
quote! {
|
||||
#scrate::metadata::StorageEntryType::Map {
|
||||
#scrate::metadata_ir::StorageEntryTypeIR::Map {
|
||||
hashers: #scrate::sp_std::vec! [
|
||||
#scrate::metadata::#hasher1,
|
||||
#scrate::metadata::#hasher2,
|
||||
#scrate::metadata_ir::#hasher1,
|
||||
#scrate::metadata_ir::#hasher2,
|
||||
],
|
||||
key: #scrate::scale_info::meta_type::<(#key1, #key2)>(),
|
||||
value: #scrate::scale_info::meta_type::<#value_type>(),
|
||||
@@ -67,9 +67,9 @@ fn storage_line_metadata_type(scrate: &TokenStream, line: &StorageLineDefExt) ->
|
||||
.map(|hasher| hasher.to_storage_hasher_struct())
|
||||
.collect::<Vec<_>>();
|
||||
quote! {
|
||||
#scrate::metadata::StorageEntryType::Map {
|
||||
#scrate::metadata_ir::StorageEntryTypeIR::Map {
|
||||
hashers: #scrate::sp_std::vec! [
|
||||
#( #scrate::metadata::StorageHasher::#hashers, )*
|
||||
#( #scrate::metadata_ir::StorageHasherIR::#hashers, )*
|
||||
],
|
||||
key: #scrate::scale_info::meta_type::<#key_tuple>(),
|
||||
value: #scrate::scale_info::meta_type::<#value_type>(),
|
||||
@@ -159,9 +159,9 @@ pub fn impl_metadata(def: &DeclStorageDefExt) -> TokenStream {
|
||||
let str_name = line.name.to_string();
|
||||
|
||||
let modifier = if line.is_option {
|
||||
quote!(#scrate::metadata::StorageEntryModifier::Optional)
|
||||
quote!(#scrate::metadata_ir::StorageEntryModifierIR::Optional)
|
||||
} else {
|
||||
quote!(#scrate::metadata::StorageEntryModifier::Default)
|
||||
quote!(#scrate::metadata_ir::StorageEntryModifierIR::Default)
|
||||
};
|
||||
|
||||
let ty = storage_line_metadata_type(scrate, line);
|
||||
@@ -172,7 +172,7 @@ pub fn impl_metadata(def: &DeclStorageDefExt) -> TokenStream {
|
||||
let docs = get_doc_literals(&line.attrs);
|
||||
|
||||
let entry = quote! {
|
||||
#scrate::metadata::StorageEntryMetadata {
|
||||
#scrate::metadata_ir::StorageEntryMetadataIR {
|
||||
name: #str_name,
|
||||
modifier: #modifier,
|
||||
ty: #ty,
|
||||
@@ -194,7 +194,7 @@ pub fn impl_metadata(def: &DeclStorageDefExt) -> TokenStream {
|
||||
};
|
||||
|
||||
let store_metadata = quote!(
|
||||
#scrate::metadata::PalletStorageMetadata {
|
||||
#scrate::metadata_ir::PalletStorageMetadataIR {
|
||||
prefix: #prefix,
|
||||
entries: #scrate::sp_std::vec![ #entries ],
|
||||
}
|
||||
@@ -209,7 +209,7 @@ pub fn impl_metadata(def: &DeclStorageDefExt) -> TokenStream {
|
||||
|
||||
impl #module_impl #module_struct #where_clause {
|
||||
#[doc(hidden)]
|
||||
pub fn storage_metadata() -> #scrate::metadata::PalletStorageMetadata {
|
||||
pub fn storage_metadata() -> #scrate::metadata_ir::PalletStorageMetadataIR {
|
||||
#store_metadata
|
||||
}
|
||||
}
|
||||
|
||||
@@ -454,13 +454,13 @@ impl HasherKind {
|
||||
|
||||
fn into_metadata(&self) -> proc_macro2::TokenStream {
|
||||
match self {
|
||||
HasherKind::Blake2_256 => quote!(StorageHasher::Blake2_256),
|
||||
HasherKind::Blake2_128 => quote!(StorageHasher::Blake2_128),
|
||||
HasherKind::Blake2_128Concat => quote!(StorageHasher::Blake2_128Concat),
|
||||
HasherKind::Twox256 => quote!(StorageHasher::Twox256),
|
||||
HasherKind::Twox128 => quote!(StorageHasher::Twox128),
|
||||
HasherKind::Twox64Concat => quote!(StorageHasher::Twox64Concat),
|
||||
HasherKind::Identity => quote!(StorageHasher::Identity),
|
||||
HasherKind::Blake2_256 => quote!(StorageHasherIR::Blake2_256),
|
||||
HasherKind::Blake2_128 => quote!(StorageHasherIR::Blake2_128),
|
||||
HasherKind::Blake2_128Concat => quote!(StorageHasherIR::Blake2_128Concat),
|
||||
HasherKind::Twox256 => quote!(StorageHasherIR::Twox256),
|
||||
HasherKind::Twox128 => quote!(StorageHasherIR::Twox128),
|
||||
HasherKind::Twox64Concat => quote!(StorageHasherIR::Twox64Concat),
|
||||
HasherKind::Identity => quote!(StorageHasherIR::Identity),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user