Adjust testing

Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>

testing/integration-tests/Cargo.toml

@@ -29,6 +29,7 @@ sp-keyring = "20.0.0"
 syn = "1.0.109"
 subxt = { version = "0.27.1", path = "../../subxt" }
 subxt-codegen = { version = "0.27.1", path = "../../codegen" }
+subxt-metadata = { version = "0.27.1", path = "../../metadata" }
 test-runtime = { path = "../test-runtime" }
 tokio = { version = "1.27", features = ["macros", "time"] }
 tracing = "0.1.34"

testing/integration-tests/src/blocks/mod.rs

@@ -106,8 +106,11 @@ async fn runtime_api_call() -> Result<(), subxt::Error> {
     let _ = <Compact<u32>>::decode(cursor)?;
     let meta: RuntimeMetadataPrefixed = Decode::decode(cursor)?;
     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`.

testing/integration-tests/src/client/mod.rs

@@ -398,10 +398,12 @@ async fn rpc_state_call() {
     let _ = <Compact<u32>>::decode(cursor).unwrap();
     let meta: RuntimeMetadataPrefixed = Decode::decode(cursor).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();

testing/integration-tests/src/metadata/validation.rs

@@ -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![],
     )
 }