From 0275204e16d0f3c604270c583d89deb44bc1e81f Mon Sep 17 00:00:00 2001
From: James Hiew <james@chainfork.com>
Date: Fri, 16 Dec 2022 15:38:42 +0000
Subject: [PATCH] Revert "Match on SignedTxData::try_from_slice directly"

This reverts commit 3416e390769cfe4119206fee897ff4220f517c24.
---
 wasm/wasm_source/src/vp_user.rs | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/wasm/wasm_source/src/vp_user.rs b/wasm/wasm_source/src/vp_user.rs
index e242bc3dfa..60bbd10443 100644
--- a/wasm/wasm_source/src/vp_user.rs
+++ b/wasm/wasm_source/src/vp_user.rs
@@ -64,22 +64,24 @@ fn validate_tx(
         verifiers
     );
 
-    let valid_sig =
-        Lazy::new(|| match SignedTxData::try_from_slice(&tx_data[..]) {
-            Ok(signed_tx_data) => {
-                let pk = key::get(ctx, &addr);
-                match pk {
-                    Ok(Some(pk)) => {
-                        matches!(
-                            ctx.verify_tx_signature(&pk, &signed_tx_data.sig),
-                            Ok(true)
-                        )
-                    }
-                    _ => false,
+    let signed_tx_data =
+        Lazy::new(|| SignedTxData::try_from_slice(&tx_data[..]));
+
+    let valid_sig = Lazy::new(|| match &*signed_tx_data {
+        Ok(signed_tx_data) => {
+            let pk = key::get(ctx, &addr);
+            match pk {
+                Ok(Some(pk)) => {
+                    matches!(
+                        ctx.verify_tx_signature(&pk, &signed_tx_data.sig),
+                        Ok(true)
+                    )
                 }
+                _ => false,
             }
-            _ => false,
-        });
+        }
+        _ => false,
+    });
 
     if !is_valid_tx(ctx, &tx_data)? {
         return reject();