Skip to content

refactor: use String for extension identifiers in metadata structures #83

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
mise42 merged 1 commit into from
Jul 2, 2025
Merged

refactor: use String for extension identifiers in metadata structures #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions pvq-extension/src/metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use crate::ExtensionIdTy;
use scale_info::prelude::string::{String, ToString};

// This trait is for ExtensionImpl
pub trait ExtensionImplMetadata {
Expand All @@ -17,15 +18,16 @@ use serde::Serialize;
#[derive(Clone, PartialEq, Eq, Encode, Debug, Serialize)]
pub struct Metadata {
pub types: PortableRegistry,
pub extensions: BTreeMap<ExtensionIdTy, ExtensionMetadata<PortableForm>>,
// Use String to prevent loss of precision in frontend codes
pub extensions: BTreeMap<String, ExtensionMetadata<PortableForm>>,
}

impl Metadata {
pub fn new(extensions: BTreeMap<ExtensionIdTy, ExtensionMetadata>) -> Self {
let mut registry = Registry::new();
let extensions = extensions
.into_iter()
.map(|(id, metadata)| (id, metadata.into_portable(&mut registry)))
.map(|(id, metadata)| (id.to_string(), metadata.into_portable(&mut registry)))
.collect();
Self {
types: registry.into(),
Expand Down
7 changes: 4 additions & 3 deletions pvq-program-metadata-gen/src/metadata_gen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ fn import_packages() -> proc_macro2::TokenStream {
use parity_scale_codec::Encode;
use scale_info::{
form::{Form, MetaForm, PortableForm},
prelude::vec::Vec,
prelude::{string::{String, ToString}, vec::Vec},
IntoPortable, PortableRegistry, Registry,
};
}
Expand All @@ -232,7 +232,8 @@ fn metadata_defs() -> proc_macro2::TokenStream {
#[derive(Clone, PartialEq, Eq, Encode, Debug, Serialize)]
pub struct Metadata {
pub types: PortableRegistry,
pub extension_fns: Vec<(ExtensionId, FnIndex, FunctionMetadata<PortableForm>)>,
// Use String to prevent loss of precision in frontend codes
pub extension_fns: Vec<(String, FnIndex, FunctionMetadata<PortableForm>)>,
pub entrypoints: Vec<FunctionMetadata<PortableForm>>,
}

Expand All @@ -241,7 +242,7 @@ fn metadata_defs() -> proc_macro2::TokenStream {
let mut registry = Registry::new();
let extension_fns = extension_fns
.into_iter()
.map(|(id, index, metadata)| (id, index, metadata.into_portable(&mut registry)))
.map(|(id, index, metadata)| (id.to_string(), index, metadata.into_portable(&mut registry)))
.collect();
let entrypoints = entrypoints
.into_iter()
Expand Down