metadata: Use v15 internally (#912)

* Update frame-metadata to v15.1.0 Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Enable V15 unstable metadata in frame-metadata Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * metadata: Move validation hashing to dedicated file Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Use sp-metadata-ir from substrate to work with metadata Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Revert using sp-metadata-ir in favor of conversion to v15 Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * metadata: Convert v14 to v15 Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * metadata: Use v15 for validation Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * codegen: Use v15 for codegen Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * metadata/bench: Use v15 Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Adjust to v15 metadata Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Adjust testing Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Improve documentation Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * force CI Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * metadata: Address feedback Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * metadata: Use HASH_LEN Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * metadta: Remove `LatestRuntimeMetadata` type alias Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * metadata: Remove `metadata_to_latest` to avoid pancis Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> --------- Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
2026-06-13 05:51:02 +00:00 · 2023-04-20 17:59:28 +03:00
parent 2f1b67b384
commit 59d195d4ad
30 changed files with 1087 additions and 920 deletions
@@ -105,8 +105,11 @@ async fn runtime_api_call() -> Result<(), subxt::Error> {
        .call_raw::<(Compact<u32>, RuntimeMetadataPrefixed)>("Metadata_metadata", None)
        .await?;
    let metadata_call = match meta.1 {
-        frame_metadata::RuntimeMetadata::V14(metadata) => metadata,
-        _ => panic!("Metadata V14 unavailable"),
+        frame_metadata::RuntimeMetadata::V14(metadata) => {
+            subxt_metadata::metadata_v14_to_latest(metadata)
+        }
+        frame_metadata::RuntimeMetadata::V15(metadata) => metadata,
+        _ => panic!("Metadata V14 or V15 unavailable"),
    };

    // Compare the runtime API call against the `state_getMetadata`.
@@ -394,10 +394,12 @@ async fn rpc_state_call() {
        .await
        .unwrap();
    let metadata_call = match meta.1 {
-        frame_metadata::RuntimeMetadata::V14(metadata) => metadata,
-        _ => panic!("Metadata V14 unavailable"),
+        frame_metadata::RuntimeMetadata::V14(metadata) => {
+            subxt_metadata::metadata_v14_to_latest(metadata)
+        }
+        frame_metadata::RuntimeMetadata::V15(metadata) => metadata,
+        _ => panic!("Metadata V14 or V15 unavailable"),
    };
-
    // Compare the runtime API call against the `state_getMetadata`.
    let metadata = api.rpc().metadata(None).await.unwrap();
    let metadata = metadata.runtime_metadata();
@@ -14,7 +14,8 @@ fn metadata_docs() -> Vec<String> {
    // Load the runtime metadata downloaded from a node via `test-runtime`.
    let meta = load_test_metadata();
    let metadata = match meta.1 {
-        frame_metadata::RuntimeMetadata::V14(v14) => v14,
+        frame_metadata::RuntimeMetadata::V14(v14) => subxt_metadata::metadata_v14_to_latest(v14),
+        frame_metadata::RuntimeMetadata::V15(v15) => v15,
        _ => panic!("Unsupported metadata version {:?}", meta.1),
    };

@@ -4,9 +4,11 @@

 use crate::{node_runtime, test_context, TestContext};
 use frame_metadata::{
-    ExtrinsicMetadata, PalletCallMetadata, PalletMetadata, PalletStorageMetadata,
-    RuntimeMetadataPrefixed, RuntimeMetadataV14, StorageEntryMetadata, StorageEntryModifier,
-    StorageEntryType,
+    v15::{
+        ExtrinsicMetadata, PalletCallMetadata, PalletMetadata, PalletStorageMetadata,
+        RuntimeMetadataV15, StorageEntryMetadata, StorageEntryModifier, StorageEntryType,
+    },
+    RuntimeMetadataPrefixed,
 };
 use scale_info::{
    build::{Fields, Variants},
@@ -15,7 +17,7 @@ use scale_info::{
 use subxt::{Metadata, OfflineClient, SubstrateConfig};

 async fn metadata_to_api(
-    metadata: RuntimeMetadataV14,
+    metadata: RuntimeMetadataV15,
    ctx: &TestContext,
 ) -> OfflineClient<SubstrateConfig> {
    let prefixed = RuntimeMetadataPrefixed::from(metadata);
@@ -37,7 +39,7 @@ async fn full_metadata_check() {
    assert!(node_runtime::validate_codegen(&api).is_ok());

    // Modify the metadata.
-    let mut metadata: RuntimeMetadataV14 = api.metadata().runtime_metadata().clone();
+    let mut metadata = api.metadata().runtime_metadata().clone();
    metadata.pallets[0].name = "NewPallet".to_string();

    let api = metadata_to_api(metadata, &ctx).await;
@@ -59,7 +61,7 @@ async fn constant_values_are_not_validated() {
    assert!(api.constants().at(&deposit_addr).is_ok());

    // Modify the metadata.
-    let mut metadata: RuntimeMetadataV14 = api.metadata().runtime_metadata().clone();
+    let mut metadata = api.metadata().runtime_metadata().clone();

    let mut existential = metadata
        .pallets
@@ -89,11 +91,12 @@ fn default_pallet() -> PalletMetadata {
        constants: vec![],
        error: None,
        index: 0,
+        docs: vec![],
    }
 }

-fn pallets_to_metadata(pallets: Vec<PalletMetadata>) -> RuntimeMetadataV14 {
-    RuntimeMetadataV14::new(
+fn pallets_to_metadata(pallets: Vec<PalletMetadata>) -> RuntimeMetadataV15 {
+    RuntimeMetadataV15::new(
        pallets,
        ExtrinsicMetadata {
            ty: meta_type::<()>(),
@@ -101,6 +104,7 @@ fn pallets_to_metadata(pallets: Vec<PalletMetadata>) -> RuntimeMetadataV14 {
            signed_extensions: vec![],
        },
        meta_type::<()>(),
+        vec![],
    )
 }