testing: Adjust testing API to latest interface

Signed-off-by: Alexandru Vasile <[email protected]>

subxt/src/events/events_type.rs

@@ -439,7 +439,10 @@ pub(crate) mod test_utils {
     use crate::{Config, SubstrateConfig};
     use codec::Encode;
     use frame_metadata::{
-        v15::{ExtrinsicMetadata, PalletEventMetadata, PalletMetadata, RuntimeMetadataV15},
+        v15::{
+            CustomMetadata, ExtrinsicMetadata, OuterEnums, PalletEventMetadata, PalletMetadata,
+            RuntimeMetadataV15,
+        },
         RuntimeMetadataPrefixed,
     };
     use scale_info::{meta_type, TypeInfo};
@@ -546,12 +549,28 @@ pub(crate) mod test_utils {
         }];
 
         let extrinsic = ExtrinsicMetadata {
-            ty: meta_type::<ExtrinsicType<RuntimeCall>>(),
             version: 0,
             signed_extensions: vec![],
+            address_ty: meta_type::<()>(),
+            call_ty: meta_type::<RuntimeCall>(),
+            signature_ty: meta_type::<()>(),
+            extra_ty: meta_type::<()>(),
         };
 
-        let meta = RuntimeMetadataV15::new(pallets, extrinsic, meta_type::<()>(), vec![]);
+        let meta = RuntimeMetadataV15::new(
+            pallets,
+            extrinsic,
+            meta_type::<()>(),
+            vec![],
+            OuterEnums {
+                call_enum_ty: meta_type::<()>(),
+                event_enum_ty: meta_type::<()>(),
+                error_enum_ty: meta_type::<()>(),
+            },
+            CustomMetadata {
+                map: Default::default(),
+            },
+        );
         let runtime_metadata: RuntimeMetadataPrefixed = meta.into();
 
         Metadata::new(runtime_metadata.try_into().unwrap())

testing/integration-tests/src/full_client/frame/balances.rs

@@ -269,12 +269,10 @@ async fn storage_total_issuance() {
 async fn storage_balance_lock() -> Result<(), subxt::Error> {
     let bob_signer = dev::bob();
     let bob: AccountId32 = dev::bob().public_key().into();
-    let charlie: AccountId32 = dev::charlie().public_key().into();
     let ctx = test_context().await;
     let api = ctx.client();
 
     let tx = node_runtime::tx().staking().bond(
-        charlie.into(),
         100_000_000_000_000,
         runtime_types::pallet_staking::RewardDestination::Stash,
     );

testing/integration-tests/src/full_client/frame/staking.rs

@@ -193,11 +193,9 @@ async fn tx_bond() -> Result<(), Error> {
 
     let alice = dev::alice();
 
-    let bond_tx = node_runtime::tx().staking().bond(
-        dev::bob().public_key().into(),
-        100_000_000_000_000,
-        RewardDestination::Stash,
-    );
+    let bond_tx = node_runtime::tx()
+        .staking()
+        .bond(100_000_000_000_000, RewardDestination::Stash);
 
     let bond = api
         .tx()

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

@@ -4,8 +4,9 @@
 
 use crate::{node_runtime, test_context, TestContext};
 use frame_metadata::v15::{
-    ExtrinsicMetadata, PalletCallMetadata, PalletMetadata, PalletStorageMetadata,
-    RuntimeMetadataV15, StorageEntryMetadata, StorageEntryModifier, StorageEntryType,
+    CustomMetadata, ExtrinsicMetadata, OuterEnums, PalletCallMetadata, PalletMetadata,
+    PalletStorageMetadata, RuntimeMetadataV15, StorageEntryMetadata, StorageEntryModifier,
+    StorageEntryType,
 };
 use scale_info::{
     build::{Fields, Variants},
@@ -76,12 +77,23 @@ fn pallets_to_metadata(pallets: Vec<PalletMetadata>) -> Metadata {
     v15_to_metadata(RuntimeMetadataV15::new(
         pallets,
         ExtrinsicMetadata {
-            ty: meta_type::<ExtrinsicType<RuntimeCall>>(),
             version: 0,
             signed_extensions: vec![],
+            address_ty: meta_type::<()>(),
+            call_ty: meta_type::<RuntimeCall>(),
+            signature_ty: meta_type::<()>(),
+            extra_ty: meta_type::<()>(),
         },
         meta_type::<()>(),
         vec![],
+        OuterEnums {
+            call_enum_ty: meta_type::<()>(),
+            event_enum_ty: meta_type::<()>(),
+            error_enum_ty: meta_type::<()>(),
+        },
+        CustomMetadata {
+            map: Default::default(),
+        },
     ))
 }
 

testing/test-runtime/build.rs

@@ -37,8 +37,8 @@ async fn run() {
 
     // Download metadata from binary. Avoid Subxt dep on `subxt::rpc::types::Bytes`and just impl here.
     // This may at least prevent this script from running so often (ie whenever we change Subxt).
-    const V15_METADATA_VERSION: u32 = 15;
-    let bytes = V15_METADATA_VERSION.encode();
+    const LATEST_STABLE_METADATA_VERSION: u32 = 15;
+    let bytes = LATEST_STABLE_METADATA_VERSION.encode();
     let version: String = format!("0x{}", hex::encode(&bytes));
     let raw: String = {
         use client::ClientT;

testing/ui-tests/src/utils/mod.rs

@@ -7,8 +7,8 @@ mod metadata_test_runner;
 
 use frame_metadata::{
     v15::{
-        ExtrinsicMetadata, PalletMetadata, PalletStorageMetadata, RuntimeMetadataV15,
-        StorageEntryMetadata,
+        CustomMetadata, ExtrinsicMetadata, OuterEnums, PalletMetadata, PalletStorageMetadata,
+        RuntimeMetadataV15, StorageEntryMetadata,
     },
     RuntimeMetadataPrefixed,
 };
@@ -24,9 +24,12 @@ pub fn generate_metadata_from_pallets_custom_dispatch_error<DispatchError: TypeI
 ) -> RuntimeMetadataPrefixed {
     // We don't care about the extrinsic type.
     let extrinsic = ExtrinsicMetadata {
-        ty: meta_type::<()>(),
         version: 0,
         signed_extensions: vec![],
+        address_ty: meta_type::<()>(),
+        call_ty: meta_type::<()>(),
+        signature_ty: meta_type::<()>(),
+        extra_ty: meta_type::<()>(),
     };
 
     // Construct metadata manually from our types (See `RuntimeMetadataV15::new()`).
@@ -43,8 +46,9 @@ pub fn generate_metadata_from_pallets_custom_dispatch_error<DispatchError: TypeI
     enum RuntimeEvent {}
 
     let ty = registry.register_type(&meta_type::<Runtime>());
-    registry.register_type(&meta_type::<RuntimeCall>());
-    registry.register_type(&meta_type::<RuntimeEvent>());
+    let runtime_call = registry.register_type(&meta_type::<RuntimeCall>());
+    let runtime_event = registry.register_type(&meta_type::<RuntimeEvent>());
+    let runtime_error = registry.register_type(&meta_type::<()>());
 
     // Metadata needs to contain this DispatchError, since codegen looks for it.
     registry.register_type(&meta_type::<DispatchError>());
@@ -55,6 +59,14 @@ pub fn generate_metadata_from_pallets_custom_dispatch_error<DispatchError: TypeI
         extrinsic,
         ty,
         apis: vec![],
+        outer_enums: OuterEnums {
+            call_enum_ty: runtime_call,
+            event_enum_ty: runtime_event,
+            error_enum_ty: runtime_error,
+        },
+        custom: CustomMetadata {
+            map: Default::default(),
+        },
     };
 
     RuntimeMetadataPrefixed::from(metadata)