fix(macros): unexpected input handler produces wrong output (#257)

.cargo/config.toml

@@ -0,0 +1,2 @@
+[target.x86_64-pc-windows-msvc]
+rustflags = ["-Clink-arg=/force:unresolved", "-Ctarget-feature=+crt-static"]

Cargo.toml

@@ -29,6 +29,7 @@ members = [
 anyhow = "1"
 const-format = { package = "const_format", version = "0.2" }
 convert-case = { package = "convert_case", version = "0.6" }
+fluent-asserter = "0.1"
 futures = { version = "0.3", default-features = false }
 gear-core-errors = "1.4.1"
 git-download = "0.1"

macros/Cargo.toml

@@ -13,6 +13,7 @@ sails-macros-core = { path = "./core" }
 proc-macro-error.workspace = true
 
 [dev-dependencies]
+fluent-asserter.workspace = true
 parity-scale-codec = { workspace = true, features = ["derive"] }
 sails-rtl.workspace = true
 scale-info = { workspace = true, features = ["derive"] }

macros/core/src/service.rs

@@ -128,6 +128,9 @@ pub fn gservice(service_impl_tokens: TokenStream2) -> TokenStream2 {
     let scale_codec_path = sails_paths::scale_codec_path();
     let scale_info_path = sails_paths::scale_info_path();
 
+    let unexpected_route_panic =
+        shared::generate_unexpected_input_panic(&input_ident, "Unknown request");
+
     quote!(
         #service_impl
 
@@ -142,8 +145,7 @@ pub fn gservice(service_impl_tokens: TokenStream2) -> TokenStream2 {
 
             pub async fn handle(&mut self, mut #input_ident: &[u8]) -> Vec<u8> {
                 #(#invocation_dispatches)*
-                let invocation_path = String::decode(&mut #input_ident).expect("Failed to decode invocation path");
-                panic!("Unknown request: {}", invocation_path);
+                #unexpected_route_panic
             }
 
             #(#invocation_funcs)*

macros/core/src/shared.rs

@@ -1,5 +1,5 @@
 use crate::route;
-use proc_macro2::TokenStream as TokenStream2;
+use proc_macro2::{Span, TokenStream as TokenStream2};
 use proc_macro_error::abort;
 use quote::{quote, ToTokens};
 use std::collections::BTreeMap;
@@ -156,16 +156,18 @@ pub(crate) fn discover_invocation_targets(
 
 pub(crate) fn generate_unexpected_input_panic(input_ident: &Ident, message: &str) -> TokenStream2 {
     let message_pattern = message.to_owned() + ": {}";
+    let copy_ident = Ident::new(&format!("__{}", input_ident), Span::call_site());
     quote!({
-        let input = String::decode(&mut #input_ident)
+        let mut #copy_ident = #input_ident;
+        let input = String::decode(&mut #copy_ident)
             .unwrap_or_else(|_| {
                 if #input_ident.len() <= 8 {
-                    format!("0x{}", hex::encode(#input_ident))
+                    format!("0x{}", sails_rtl::hex::encode(#input_ident))
                 } else {
                     format!(
                         "0x{}..{}",
-                        hex::encode(&#input_ident[..4]),
-                        hex::encode(&#input_ident[#input_ident.len() - 4..]))
+                        sails_rtl::hex::encode(&#input_ident[..4]),
+                        sails_rtl::hex::encode(&#input_ident[#input_ident.len() - 4..]))
                 }
             });
         panic!(#message_pattern, input)

macros/core/tests/snapshots/program__gprogram_generates_handle_for_multiple_services_with_non_empty_routes.snap

@@ -77,14 +77,15 @@ pub mod wasm {
         let input = gstd::msg::load_bytes().expect("Failed to read input");
         if !input.is_empty() {
             {
-                let input = String::decode(&mut input)
+                let mut __input = input;
+                let input = String::decode(&mut __input)
                     .unwrap_or_else(|_| {
                         if input.len() <= 8 {
-                            format!("0x{}", hex::encode(input))
+                            format!("0x{}", sails_rtl::hex::encode(input))
                         } else {
                             format!(
-                                "0x{}..{}", hex::encode(& input[..4]), hex::encode(&
-                                input[input.len() - 4..])
+                                "0x{}..{}", sails_rtl::hex::encode(& input[..4]),
+                                sails_rtl::hex::encode(& input[input.len() - 4..])
                             )
                         }
                     });
@@ -112,14 +113,15 @@ pub mod wasm {
             let output = service.handle(&input[__ROUTE_SVC1.len()..]).await;
             [__ROUTE_SVC1.as_ref(), &output].concat()
         } else {
-            let input = String::decode(&mut input)
+            let mut __input = input;
+            let input = String::decode(&mut __input)
                 .unwrap_or_else(|_| {
                     if input.len() <= 8 {
-                        format!("0x{}", hex::encode(input))
+                        format!("0x{}", sails_rtl::hex::encode(input))
                     } else {
                         format!(
-                            "0x{}..{}", hex::encode(& input[..4]), hex::encode(&
-                            input[input.len() - 4..])
+                            "0x{}..{}", sails_rtl::hex::encode(& input[..4]),
+                            sails_rtl::hex::encode(& input[input.len() - 4..])
                         )
                     }
                 });

macros/core/tests/snapshots/program__gprogram_generates_handle_for_single_service_with_non_empty_route.snap

@@ -56,14 +56,15 @@ pub mod wasm {
         let input = gstd::msg::load_bytes().expect("Failed to read input");
         if !input.is_empty() {
             {
-                let input = String::decode(&mut input)
+                let mut __input = input;
+                let input = String::decode(&mut __input)
                     .unwrap_or_else(|_| {
                         if input.len() <= 8 {
-                            format!("0x{}", hex::encode(input))
+                            format!("0x{}", sails_rtl::hex::encode(input))
                         } else {
                             format!(
-                                "0x{}..{}", hex::encode(& input[..4]), hex::encode(&
-                                input[input.len() - 4..])
+                                "0x{}..{}", sails_rtl::hex::encode(& input[..4]),
+                                sails_rtl::hex::encode(& input[input.len() - 4..])
                             )
                         }
                     });
@@ -85,14 +86,15 @@ pub mod wasm {
             let output = service.handle(&input[__ROUTE_SERVICE.len()..]).await;
             [__ROUTE_SERVICE.as_ref(), &output].concat()
         } else {
-            let input = String::decode(&mut input)
+            let mut __input = input;
+            let input = String::decode(&mut __input)
                 .unwrap_or_else(|_| {
                     if input.len() <= 8 {
-                        format!("0x{}", hex::encode(input))
+                        format!("0x{}", sails_rtl::hex::encode(input))
                     } else {
                         format!(
-                            "0x{}..{}", hex::encode(& input[..4]), hex::encode(&
-                            input[input.len() - 4..])
+                            "0x{}..{}", sails_rtl::hex::encode(& input[..4]),
+                            sails_rtl::hex::encode(& input[input.len() - 4..])
                         )
                     }
                 });

macros/core/tests/snapshots/program__gprogram_generates_init_for_multiple_ctors.snap

@@ -68,14 +68,15 @@ pub mod wasm {
             let program = MyProgram::new2(request.p2, request.p1);
             (program, INVOCATION_ROUTE.as_ref())
         } else {
-            let input = String::decode(&mut input)
+            let mut __input = input;
+            let input = String::decode(&mut __input)
                 .unwrap_or_else(|_| {
                     if input.len() <= 8 {
-                        format!("0x{}", hex::encode(input))
+                        format!("0x{}", sails_rtl::hex::encode(input))
                     } else {
                         format!(
-                            "0x{}..{}", hex::encode(& input[..4]), hex::encode(&
-                            input[input.len() - 4..])
+                            "0x{}..{}", sails_rtl::hex::encode(& input[..4]),
+                            sails_rtl::hex::encode(& input[input.len() - 4..])
                         )
                     }
                 });
@@ -90,14 +91,15 @@ pub mod wasm {
     async fn main() {
         let mut input: &[u8] = &gstd::msg::load_bytes().expect("Failed to read input");
         let output: Vec<u8> = {
-            let input = String::decode(&mut input)
+            let mut __input = input;
+            let input = String::decode(&mut __input)
                 .unwrap_or_else(|_| {
                     if input.len() <= 8 {
-                        format!("0x{}", hex::encode(input))
+                        format!("0x{}", sails_rtl::hex::encode(input))
                     } else {
                         format!(
-                            "0x{}..{}", hex::encode(& input[..4]), hex::encode(&
-                            input[input.len() - 4..])
+                            "0x{}..{}", sails_rtl::hex::encode(& input[..4]),
+                            sails_rtl::hex::encode(& input[input.len() - 4..])
                         )
                     }
                 });

macros/core/tests/snapshots/program__gprogram_generates_init_for_no_ctor.snap

@@ -31,14 +31,15 @@ pub mod wasm {
         let input = gstd::msg::load_bytes().expect("Failed to read input");
         if !input.is_empty() {
             {
-                let input = String::decode(&mut input)
+                let mut __input = input;
+                let input = String::decode(&mut __input)
                     .unwrap_or_else(|_| {
                         if input.len() <= 8 {
-                            format!("0x{}", hex::encode(input))
+                            format!("0x{}", sails_rtl::hex::encode(input))
                         } else {
                             format!(
-                                "0x{}..{}", hex::encode(& input[..4]), hex::encode(&
-                                input[input.len() - 4..])
+                                "0x{}..{}", sails_rtl::hex::encode(& input[..4]),
+                                sails_rtl::hex::encode(& input[input.len() - 4..])
                             )
                         }
                     });
@@ -54,14 +55,15 @@ pub mod wasm {
     async fn main() {
         let mut input: &[u8] = &gstd::msg::load_bytes().expect("Failed to read input");
         let output: Vec<u8> = {
-            let input = String::decode(&mut input)
+            let mut __input = input;
+            let input = String::decode(&mut __input)
                 .unwrap_or_else(|_| {
                     if input.len() <= 8 {
-                        format!("0x{}", hex::encode(input))
+                        format!("0x{}", sails_rtl::hex::encode(input))
                     } else {
                         format!(
-                            "0x{}..{}", hex::encode(& input[..4]), hex::encode(&
-                            input[input.len() - 4..])
+                            "0x{}..{}", sails_rtl::hex::encode(& input[..4]),
+                            sails_rtl::hex::encode(& input[input.len() - 4..])
                         )
                     }
                 });

macros/core/tests/snapshots/program__gprogram_generates_init_for_single_ctor.snap

@@ -51,14 +51,15 @@ pub mod wasm {
             let program = MyProgram::new(request.p1, request.p2).await;
             (program, INVOCATION_ROUTE.as_ref())
         } else {
-            let input = String::decode(&mut input)
+            let mut __input = input;
+            let input = String::decode(&mut __input)
                 .unwrap_or_else(|_| {
                     if input.len() <= 8 {
-                        format!("0x{}", hex::encode(input))
+                        format!("0x{}", sails_rtl::hex::encode(input))
                     } else {
                         format!(
-                            "0x{}..{}", hex::encode(& input[..4]), hex::encode(&
-                            input[input.len() - 4..])
+                            "0x{}..{}", sails_rtl::hex::encode(& input[..4]),
+                            sails_rtl::hex::encode(& input[input.len() - 4..])
                         )
                     }
                 });
@@ -73,14 +74,15 @@ pub mod wasm {
     async fn main() {
         let mut input: &[u8] = &gstd::msg::load_bytes().expect("Failed to read input");
         let output: Vec<u8> = {
-            let input = String::decode(&mut input)
+            let mut __input = input;
+            let input = String::decode(&mut __input)
                 .unwrap_or_else(|_| {
                     if input.len() <= 8 {
-                        format!("0x{}", hex::encode(input))
+                        format!("0x{}", sails_rtl::hex::encode(input))
                     } else {
                         format!(
-                            "0x{}..{}", hex::encode(& input[..4]), hex::encode(&
-                            input[input.len() - 4..])
+                            "0x{}..{}", sails_rtl::hex::encode(& input[..4]),
+                            sails_rtl::hex::encode(& input[input.len() - 4..])
                         )
                     }
                 });

macros/core/tests/snapshots/service__gservice_works.snap

@@ -43,9 +43,21 @@ impl Exposure<SomeService> {
             static INVOCATION_ROUTE: [u8; 5usize] = [16u8, 84u8, 104u8, 105u8, 115u8];
             return [INVOCATION_ROUTE.as_ref(), &output].concat();
         }
-        let invocation_path = String::decode(&mut input)
-            .expect("Failed to decode invocation path");
-        panic!("Unknown request: {}", invocation_path);
+        {
+            let mut __input = input;
+            let input = String::decode(&mut __input)
+                .unwrap_or_else(|_| {
+                    if input.len() <= 8 {
+                        format!("0x{}", sails_rtl::hex::encode(input))
+                    } else {
+                        format!(
+                            "0x{}..{}", sails_rtl::hex::encode(& input[..4]),
+                            sails_rtl::hex::encode(& input[input.len() - 4..])
+                        )
+                    }
+                });
+            panic!("Unknown request: {}", input)
+        }
     }
     async fn __do_this(&mut self, mut input: &[u8]) -> Vec<u8> {
         let request = __DoThisParams::decode(&mut input)