Revert "Match on SignedTxData::try_from_slice directly"

This reverts commit 3416e39.
anoma · Dec 16, 2022 · 0275204 · 0275204
1 parent 1821c7e
commit 0275204
Showing 1 changed file with 16 additions and 14 deletions.
diff --git 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();