From 3d884e5791ce76feb00d5ff2bfb170a93d4136c4 Mon Sep 17 00:00:00 2001 From: vms Date: Wed, 28 Apr 2021 00:02:22 +0300 Subject: [PATCH] fix serde behaviour in fce_test --- crates/fce-test-macro-impl/Cargo.toml | 2 +- .../fce-test-macro-impl/src/fce_test/glue_code_generator.rs | 4 ++-- crates/fce-test-macro-impl/src/fce_test/module_generator.rs | 4 ++-- .../src/fce_test/module_generator/methods_generator.rs | 6 +++--- .../src/fce_test/module_generator/record_type_generator.rs | 3 ++- crates/fce-test-macro/Cargo.toml | 4 ++-- fluence-test/Cargo.toml | 4 ++-- fluence-test/src/lib.rs | 5 ++--- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/crates/fce-test-macro-impl/Cargo.toml b/crates/fce-test-macro-impl/Cargo.toml index 069c306..70cea71 100644 --- a/crates/fce-test-macro-impl/Cargo.toml +++ b/crates/fce-test-macro-impl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fluence-sdk-test-macro-impl" -version = "0.1.0" # remember to update html_root_url +version = "0.1.2" # remember to update html_root_url edition = "2018" description = "Implementation of the `#[fce_test]` macro" repository = "https://github.com/fluencelabs/rust-sdk/crates/macro-test" diff --git a/crates/fce-test-macro-impl/src/fce_test/glue_code_generator.rs b/crates/fce-test-macro-impl/src/fce_test/glue_code_generator.rs index 5c51423..c18f076 100644 --- a/crates/fce-test-macro-impl/src/fce_test/glue_code_generator.rs +++ b/crates/fce-test-macro-impl/src/fce_test/glue_code_generator.rs @@ -55,14 +55,14 @@ use std::path::Path; /// /// pub fn greeting(&mut self, name: String) -> String { /// use std::ops::DerefMut; -/// let arguments = fluence_test::internal::json!([name]); +/// let arguments = fluence_test::internal::serde_json::json!([name]); /// let result = self /// .fce /// .as_ref /// .borrow_mut() /// .call_with_module_name("greeting", "greeting", arguments, <_>::default()) /// .expect("call to FCE failed"); -/// let result: String = serde_json::from_value(result) +/// let result: String = fluence_test::internal::serde_json::from_value(result) /// .expect("the default deserializer shouldn't fail"); /// result /// } diff --git a/crates/fce-test-macro-impl/src/fce_test/module_generator.rs b/crates/fce-test-macro-impl/src/fce_test/module_generator.rs index c29ea00..06356c3 100644 --- a/crates/fce-test-macro-impl/src/fce_test/module_generator.rs +++ b/crates/fce-test-macro-impl/src/fce_test/module_generator.rs @@ -39,14 +39,14 @@ use quote::quote; /// /// pub fn greeting(&mut self, name: String) -> String { /// use std::ops::DerefMut; -/// let arguments = fluence_test::internal::json!([name]); +/// let arguments = fluence_test::internal::serde_json::json!([name]); /// let result = self /// .fce /// .as_ref /// .borrow_mut() /// .call_with_module_name("greeting", "greeting", arguments, <_>::default()) /// .expect("call to FCE failed"); -/// let result: String = serde_json::from_value(result) +/// let result: String = fluence_test::internal::serde_json::from_value(result) /// .expect("the default deserializer shouldn't fail"); /// result /// } diff --git a/crates/fce-test-macro-impl/src/fce_test/module_generator/methods_generator.rs b/crates/fce-test-macro-impl/src/fce_test/module_generator/methods_generator.rs index bdc2a47..0fbb3dc 100644 --- a/crates/fce-test-macro-impl/src/fce_test/module_generator/methods_generator.rs +++ b/crates/fce-test-macro-impl/src/fce_test/module_generator/methods_generator.rs @@ -85,13 +85,13 @@ fn generate_arguments_converter<'a>( let arg_idents: Vec = args.map(utils::new_ident).collect::>()?; let args_converter = - quote! { let arguments = fluence_test::internal::json!([#(#arg_idents),*]); }; + quote! { let arguments = fluence_test::internal::serde_json::json!([#(#arg_idents),*]); }; Ok(args_converter) } fn generate_function_call(module_name: &str, method_name: &str) -> TokenStream { - quote! { self.fce.as_ref().borrow_mut().call_with_module_name(#module_name, #method_name, arguments, <_>::default()).expect("call to FCE failed"); } + quote! { self.fce.as_ref().borrow_mut().call_module(#module_name, #method_name, arguments, <_>::default()).expect("call to FCE failed"); } } fn generate_set_result(output_type: &Option<&IType>) -> TokenStream { @@ -109,7 +109,7 @@ fn generate_convert_to_output( Some(ty) => { let ty = utils::itype_to_tokens(ty, records)?; quote! { - let result: #ty = serde_json::from_value(result).expect("the default deserializer shouldn't fail"); + let result: #ty = fluence_test::internal::serde_json::from_value(result).expect("the default deserializer shouldn't fail"); } } None => TokenStream::new(), diff --git a/crates/fce-test-macro-impl/src/fce_test/module_generator/record_type_generator.rs b/crates/fce-test-macro-impl/src/fce_test/module_generator/record_type_generator.rs index 2e20dfd..acdde47 100644 --- a/crates/fce-test-macro-impl/src/fce_test/module_generator/record_type_generator.rs +++ b/crates/fce-test-macro-impl/src/fce_test/module_generator/record_type_generator.rs @@ -31,7 +31,8 @@ pub(super) fn generate_records(records: &FCERecordTypes) -> TResult