Restore get_mod as test helper and fmt

proc-macro/src/generate_types.rs

@@ -703,6 +703,20 @@ mod tests {
     const MOD_PATH: &'static [&'static str] =
         &["chameleon_core", "generate_types", "tests"];
 
+    fn get_mod<'a>(
+        module: &'a Module,
+        path_segs: &[&'static str],
+    ) -> Option<&'a Module<'a>> {
+        let (mod_name, rest) = path_segs.split_first()?;
+        let mod_ident = Ident::new(mod_name, Span::call_site());
+        let module = module.children.get(&mod_ident)?;
+        if rest.is_empty() {
+            Some(module)
+        } else {
+            get_mod(module, rest)
+        }
+    }
+
     #[test]
     fn generate_struct_with_primitives() {
         #[allow(unused)]
@@ -717,9 +731,9 @@ mod tests {
         registry.register_type(&meta_type::<S>());
         let portable_types: PortableRegistry = registry.into();
 
-        let type_gen = TypeGenerator::new(&portable_types, "root");
+        let type_gen = TypeGenerator::new(&portable_types, "root", Default::default());
         let types = type_gen.generate_types_mod();
-        let tests_mod = types.get_mod(MOD_PATH).unwrap();
+        let tests_mod = get_mod(&types, MOD_PATH).unwrap();
 
         assert_eq!(
             tests_mod.into_token_stream().to_string(),
@@ -758,9 +772,9 @@ mod tests {
         registry.register_type(&meta_type::<Parent>());
         let portable_types: PortableRegistry = registry.into();
 
-        let type_gen = TypeGenerator::new(&portable_types, "root");
+        let type_gen = TypeGenerator::new(&portable_types, "root", Default::default());
         let types = type_gen.generate_types_mod();
-        let tests_mod = types.get_mod(MOD_PATH).unwrap();
+        let tests_mod = get_mod(&types, MOD_PATH).unwrap();
 
         assert_eq!(
             tests_mod.into_token_stream().to_string(),
@@ -798,9 +812,9 @@ mod tests {
         registry.register_type(&meta_type::<Parent>());
         let portable_types: PortableRegistry = registry.into();
 
-        let type_gen = TypeGenerator::new(&portable_types, "root");
+        let type_gen = TypeGenerator::new(&portable_types, "root", Default::default());
         let types = type_gen.generate_types_mod();
-        let tests_mod = types.get_mod(MOD_PATH).unwrap();
+        let tests_mod = get_mod(&types, MOD_PATH).unwrap();
 
         assert_eq!(
             tests_mod.into_token_stream().to_string(),
@@ -833,9 +847,9 @@ mod tests {
         registry.register_type(&meta_type::<E>());
         let portable_types: PortableRegistry = registry.into();
 
-        let type_gen = TypeGenerator::new(&portable_types, "root");
+        let type_gen = TypeGenerator::new(&portable_types, "root", Default::default());
         let types = type_gen.generate_types_mod();
-        let tests_mod = types.get_mod(MOD_PATH).unwrap();
+        let tests_mod = get_mod(&types, MOD_PATH).unwrap();
 
         assert_eq!(
             tests_mod.into_token_stream().to_string(),
@@ -866,9 +880,9 @@ mod tests {
         registry.register_type(&meta_type::<S>());
         let portable_types: PortableRegistry = registry.into();
 
-        let type_gen = TypeGenerator::new(&portable_types, "root");
+        let type_gen = TypeGenerator::new(&portable_types, "root", Default::default());
         let types = type_gen.generate_types_mod();
-        let tests_mod = types.get_mod(MOD_PATH).unwrap();
+        let tests_mod = get_mod(&types, MOD_PATH).unwrap();
 
         assert_eq!(
             tests_mod.into_token_stream().to_string(),
@@ -898,9 +912,9 @@ mod tests {
         registry.register_type(&meta_type::<S>());
         let portable_types: PortableRegistry = registry.into();
 
-        let type_gen = TypeGenerator::new(&portable_types, "root");
+        let type_gen = TypeGenerator::new(&portable_types, "root", Default::default());
         let types = type_gen.generate_types_mod();
-        let tests_mod = types.get_mod(MOD_PATH).unwrap();
+        let tests_mod = get_mod(&types, MOD_PATH).unwrap();
 
         assert_eq!(
             tests_mod.into_token_stream().to_string(),
@@ -935,9 +949,9 @@ mod tests {
         registry.register_type(&meta_type::<S>());
         let portable_types: PortableRegistry = registry.into();
 
-        let type_gen = TypeGenerator::new(&portable_types, "root");
+        let type_gen = TypeGenerator::new(&portable_types, "root", Default::default());
         let types = type_gen.generate_types_mod();
-        let tests_mod = types.get_mod(MOD_PATH).unwrap();
+        let tests_mod = get_mod(&types, MOD_PATH).unwrap();
 
         assert_eq!(
             tests_mod.into_token_stream().to_string(),
@@ -970,9 +984,9 @@ mod tests {
         registry.register_type(&meta_type::<E>());
         let portable_types: PortableRegistry = registry.into();
 
-        let type_gen = TypeGenerator::new(&portable_types, "root");
+        let type_gen = TypeGenerator::new(&portable_types, "root", Default::default());
         let types = type_gen.generate_types_mod();
-        let tests_mod = types.get_mod(MOD_PATH).unwrap();
+        let tests_mod = get_mod(&types, MOD_PATH).unwrap();
 
         assert_eq!(
             tests_mod.into_token_stream().to_string(),
@@ -1003,9 +1017,9 @@ mod tests {
         registry.register_type(&meta_type::<S>());
         let portable_types: PortableRegistry = registry.into();
 
-        let type_gen = TypeGenerator::new(&portable_types, "root");
+        let type_gen = TypeGenerator::new(&portable_types, "root", Default::default());
         let types = type_gen.generate_types_mod();
-        let tests_mod = types.get_mod(MOD_PATH).unwrap();
+        let tests_mod = get_mod(&types, MOD_PATH).unwrap();
 
         assert_eq!(
             tests_mod.into_token_stream().to_string(),
@@ -1042,9 +1056,9 @@ mod tests {
         registry.register_type(&meta_type::<Bar>());
         let portable_types: PortableRegistry = registry.into();
 
-        let type_gen = TypeGenerator::new(&portable_types, "root");
+        let type_gen = TypeGenerator::new(&portable_types, "root", Default::default());
         let types = type_gen.generate_types_mod();
-        let tests_mod = types.get_mod(MOD_PATH).unwrap();
+        let tests_mod = get_mod(&types, MOD_PATH).unwrap();
 
         assert_eq!(
             tests_mod.into_token_stream().to_string(),
@@ -1085,9 +1099,9 @@ mod tests {
         registry.register_type(&meta_type::<Bar<bool>>());
         let portable_types: PortableRegistry = registry.into();
 
-        let type_gen = TypeGenerator::new(&portable_types, "root");
+        let type_gen = TypeGenerator::new(&portable_types, "root", Default::default());
         let types = type_gen.generate_types_mod();
-        let tests_mod = types.get_mod(MOD_PATH).unwrap();
+        let tests_mod = get_mod(&types, MOD_PATH).unwrap();
 
         assert_eq!(
             tests_mod.into_token_stream().to_string(),
@@ -1132,9 +1146,9 @@ mod tests {
         registry.register_type(&meta_type::<S>());
         let portable_types: PortableRegistry = registry.into();
 
-        let type_gen = TypeGenerator::new(&portable_types, "root");
+        let type_gen = TypeGenerator::new(&portable_types, "root", Default::default());
         let types = type_gen.generate_types_mod();
-        let tests_mod = types.get_mod(MOD_PATH).unwrap();
+        let tests_mod = get_mod(&types, MOD_PATH).unwrap();
 
         assert_eq!(
             tests_mod.into_token_stream().to_string(),
@@ -1180,9 +1194,9 @@ mod tests {
         registry.register_type(&meta_type::<UnnamedFields<bool, bool>>());
         let portable_types: PortableRegistry = registry.into();
 
-        let type_gen = TypeGenerator::new(&portable_types, "root");
+        let type_gen = TypeGenerator::new(&portable_types, "root", Default::default());
         let types = type_gen.generate_types_mod();
-        let tests_mod = types.get_mod(MOD_PATH).unwrap();
+        let tests_mod = get_mod(&types, MOD_PATH).unwrap();
 
         assert_eq!(
             tests_mod.into_token_stream().to_string(),
@@ -1235,9 +1249,9 @@ mod tests {
         registry.register_type(&meta_type::<modules::c::Foo>());
         let portable_types: PortableRegistry = registry.into();
 
-        let type_gen = TypeGenerator::new(&portable_types, "root");
+        let type_gen = TypeGenerator::new(&portable_types, "root", Default::default());
         let types = type_gen.generate_types_mod();
-        let tests_mod = types.get_mod(MOD_PATH).unwrap();
+        let tests_mod = get_mod(&types, MOD_PATH).unwrap();
 
         assert_eq!(
             tests_mod.into_token_stream().to_string(),

tests/src/client.rs

@@ -14,7 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with substrate-subxt.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::{runtime::node_runtime::system, test_node_process, test_node_process_with};
+use crate::{
+    runtime::node_runtime::system,
+    test_node_process,
+    test_node_process_with,
+};
 
 use sp_core::storage::{
     well_known_keys,
@@ -104,7 +108,11 @@ async fn fetch_keys() {
 async fn test_iter() {
     let node_process = test_node_process().await;
     let client = node_process.client();
-    let mut iter = client.storage().iter::<system::storage::Account>(None).await.unwrap();
+    let mut iter = client
+        .storage()
+        .iter::<system::storage::Account>(None)
+        .await
+        .unwrap();
     let mut i = 0;
     while let Some(_) = iter.next().await.unwrap() {
         i += 1;

tests/src/frame/balances.rs

@@ -25,11 +25,9 @@ use crate::{
     TestRuntime,
 };
 use sp_keyring::AccountKeyring;
-use subxt::{
-    extrinsic::{
-        PairSigner,
-        Signer,
-    },
+use subxt::extrinsic::{
+    PairSigner,
+    Signer,
 };
 
 #[async_std::test]

tests/src/frame/contracts.rs

@@ -31,7 +31,14 @@ use crate::{
 };
 use sp_core::sr25519::Pair;
 use sp_runtime::MultiAddress;
-use subxt::{Client, Error, ExtrinsicSuccess, PairSigner, Runtime, StorageEntry};
+use subxt::{
+    Client,
+    Error,
+    ExtrinsicSuccess,
+    PairSigner,
+    Runtime,
+    StorageEntry,
+};
 
 struct ContractsTestContext {
     cxt: TestContext,
@@ -177,14 +184,22 @@ async fn tx_call() {
     // assert!(contract_info.is_ok());
 
     let contract_info_of = storage::ContractInfoOf(contract.clone());
-    let storage_entry_key = <storage::ContractInfoOf as StorageEntry>::key(&contract_info_of);
+    let storage_entry_key =
+        <storage::ContractInfoOf as StorageEntry>::key(&contract_info_of);
     let final_key = storage_entry_key.final_key::<storage::ContractInfoOf>();
     println!("contract_info_key key {:?}", hex::encode(&final_key.0));
 
-    let res = ctx.client().storage().fetch_raw(final_key, None).await.unwrap();
+    let res = ctx
+        .client()
+        .storage()
+        .fetch_raw(final_key, None)
+        .await
+        .unwrap();
     println!("Result {:?}", res);
 
-    let keys = ctx.client().storage()
+    let keys = ctx
+        .client()
+        .storage()
         .fetch_keys::<storage::ContractInfoOf>(5, None, None)
         .await
         .unwrap()

tests/src/lib.rs

@@ -22,5 +22,8 @@ mod client;
 #[cfg(test)]
 mod frame;
 
+pub use runtime::{
+    node_runtime,
+    TestRuntime,
+};
 pub use utils::*;
-pub use runtime::{TestRuntime, node_runtime};

tests/src/runtime.rs

@@ -15,7 +15,11 @@
 // along with substrate-subxt.  If not, see <http://www.gnu.org/licenses/>.
 
 use sp_runtime::traits::BlakeTwo256;
-use subxt::{Runtime, StorageEntry, subxt};
+use subxt::{
+    subxt,
+    Runtime,
+    StorageEntry,
+};
 
 #[subxt(runtime_metadata_path = "node_runtime.scale")]
 pub mod node_runtime {

tests/src/utils/context.rs

@@ -15,7 +15,9 @@
 // along with substrate-subxt.  If not, see <http://www.gnu.org/licenses/>.
 
 pub use crate::{
-    TestNodeProcess, TestRuntime, node_runtime,
+    node_runtime,
+    TestNodeProcess,
+    TestRuntime,
 };
 
 use sp_keyring::AccountKeyring;
@@ -55,5 +57,9 @@ pub async fn test_context() -> TestContext {
     let node_proc = test_node_process_with(AccountKeyring::Alice).await;
     let client = node_proc.client().clone();
     let api = node_runtime::RuntimeApi::<TestRuntime>::new(client.clone());
-    TestContext { node_proc, api, client }
-}
+    TestContext {
+        node_proc,
+        api,
+        client,
+    }
+}

tests/src/utils/mod.rs

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with substrate-subxt.  If not, see <http://www.gnu.org/licenses/>.
 
-mod node_proc;
 mod context;
+mod node_proc;
 
+pub use context::*;
 pub use node_proc::TestNodeProcess;
-pub use context::*;