Merge branch 'master' into tadeohepperle-static-decoding-of-signed-extensions

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

@@ -185,7 +185,7 @@ async fn fetch_block_and_decode_extrinsic_details() {
         .submit_and_watch()
         .await
         .unwrap()
-        .wait_for_in_block()
+        .wait_for_finalized()
         .await
         .unwrap();
 
@@ -306,7 +306,6 @@ async fn decode_signed_extensions_from_blocks() {
     assert_eq!(nonce2, nonce2_static);
     assert_eq!(tip2, 5678);
     assert_eq!(tip2, tip2_static);
-
     assert_eq!(extensions1.iter().count(), expected_signed_extensions.len());
     for (e, expected_name) in extensions1.iter().zip(expected_signed_extensions.iter()) {
         assert_eq!(e.unwrap().name(), *expected_name);

testing/integration-tests/src/full_client/codegen/codegen_tests.rs

@@ -7,7 +7,7 @@ use frame_metadata::{
     RuntimeMetadataPrefixed,
 };
 use scale_info::{meta_type, IntoPortable, PortableRegistry, Registry, TypeInfo};
-use subxt_codegen::{CratePath, DerivesRegistry, RuntimeGenerator, TypeSubstitutes};
+use subxt_codegen::CodegenBuilder;
 use syn::__private::quote;
 
 fn generate_runtime_interface_from_metadata(metadata: RuntimeMetadataPrefixed) -> String {
@@ -15,15 +15,10 @@ fn generate_runtime_interface_from_metadata(metadata: RuntimeMetadataPrefixed) -
     let metadata = metadata
         .try_into()
         .expect("frame_metadata should be convertible into Metadata");
-    let generator = RuntimeGenerator::new(metadata);
-    let item_mod = syn::parse_quote!(
-        pub mod api {}
-    );
-    let crate_path = CratePath::default();
-    let derives = DerivesRegistry::with_default_derives(&crate_path);
-    let type_substitutes = TypeSubstitutes::with_default_substitutes(&crate_path);
-    generator
-        .generate_runtime(item_mod, derives, type_substitutes, crate_path, false)
+
+    CodegenBuilder::new()
+        .no_docs()
+        .generate(metadata)
         .expect("API generation must be valid")
         .to_string()
 }

testing/integration-tests/src/full_client/codegen/documentation.rs

@@ -4,7 +4,7 @@
 
 use codec::Decode;
 use regex::Regex;
-use subxt_codegen::{CratePath, DerivesRegistry, RuntimeGenerator, TypeSubstitutes};
+use subxt_codegen::{ syn, CodegenBuilder };
 use subxt_metadata::Metadata;
 
 fn load_test_metadata() -> Metadata {
@@ -48,25 +48,18 @@ fn metadata_docs() -> Vec<String> {
     docs
 }
 
-fn generate_runtime_interface(crate_path: CratePath, should_gen_docs: bool) -> String {
+fn generate_runtime_interface(should_gen_docs: bool) -> String {
     // Load the runtime metadata downloaded from a node via `test-runtime`.
     let metadata = load_test_metadata();
 
-    // Generate a runtime interface from the provided metadata.
-    let generator = RuntimeGenerator::new(metadata);
-    let item_mod = syn::parse_quote!(
-        pub mod api {}
-    );
-    let derives = DerivesRegistry::with_default_derives(&crate_path);
-    let type_substitutes = TypeSubstitutes::with_default_substitutes(&crate_path);
-    generator
-        .generate_runtime(
-            item_mod,
-            derives,
-            type_substitutes,
-            crate_path,
-            should_gen_docs,
-        )
+    let mut codegen = CodegenBuilder::new();
+
+    if !should_gen_docs {
+        codegen.no_docs();
+    }
+
+    codegen
+        .generate(metadata)
         .expect("API generation must be valid")
         .to_string()
 }
@@ -74,7 +67,7 @@ fn generate_runtime_interface(crate_path: CratePath, should_gen_docs: bool) -> S
 fn interface_docs(should_gen_docs: bool) -> Vec<String> {
     // Generate the runtime interface from the node's metadata.
     // Note: the API is generated on a single line.
-    let runtime_api = generate_runtime_interface(CratePath::default(), should_gen_docs);
+    let runtime_api = generate_runtime_interface(should_gen_docs);
 
     // Documentation lines have the following format:
     //    # [ doc = "Upward message is invalid XCM."]
@@ -145,18 +138,10 @@ fn check_root_attrs_preserved() {
         pub mod api {}
     );
 
-    // Generate a runtime interface from the provided metadata.
-    let generator = RuntimeGenerator::new(metadata);
-    let derives = DerivesRegistry::with_default_derives(&CratePath::default());
-    let type_substitutes = TypeSubstitutes::with_default_substitutes(&CratePath::default());
-    let generated_code = generator
-        .generate_runtime(
-            item_mod,
-            derives,
-            type_substitutes,
-            CratePath::default(),
-            true,
-        )
+    let mut codegen = CodegenBuilder::new();
+    codegen.set_target_module(item_mod);
+    let generated_code = codegen
+        .generate(metadata)
         .expect("API generation must be valid")
         .to_string();