From 338d7ed3bc99c04d79cd3843838e754149b3228e Mon Sep 17 00:00:00 2001
From: Lukasz Rubaszewski <117115317+lrubasze@users.noreply.github.com>
Date: Fri, 24 Jan 2025 09:12:29 +0100
Subject: [PATCH] Fix benchmarks and no_std

---
 radix-engine-tests/assets/blueprints/.cargo/config.toml | 2 +-
 radix-engine-tests/benches/costing.rs                   | 7 +++----
 radix-engine/src/vm/wasm/wasm_validator.rs              | 2 --
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/radix-engine-tests/assets/blueprints/.cargo/config.toml b/radix-engine-tests/assets/blueprints/.cargo/config.toml
index 435ed755ec2..f4e8c002fc2 100644
--- a/radix-engine-tests/assets/blueprints/.cargo/config.toml
+++ b/radix-engine-tests/assets/blueprints/.cargo/config.toml
@@ -1,2 +1,2 @@
 [build]
-target = "wasm32-unknown-unknown"
\ No newline at end of file
+target = "wasm32-unknown-unknown"
diff --git a/radix-engine-tests/benches/costing.rs b/radix-engine-tests/benches/costing.rs
index 7c852d8b83d..d08b95e5524 100644
--- a/radix-engine-tests/benches/costing.rs
+++ b/radix-engine-tests/benches/costing.rs
@@ -175,8 +175,7 @@ fn bench_validate_secp256k1(c: &mut Criterion) {
 fn bench_spin_loop_v1(c: &mut Criterion) {
     // Prepare code
     let code =
-        wat2wasm(&include_local_wasm_str!("loop.wat").replace("${n}", &i32::MAX.to_string()))
-            .unwrap();
+        wat2wasm(&include_local_wasm_str!("loop.wat").replace("${n}", &i32::MAX.to_string()));
     let mut ledger = LedgerSimulatorBuilder::new().build();
     let package_address = ledger.publish_package_simple(PackagePublishingSource::PublishExisting(
         code,
@@ -209,7 +208,7 @@ fn bench_spin_loop_v1(c: &mut Criterion) {
 // There is only one instruction `br` per iteration.
 // It's extremely helpful for stress testing the `consume_wasm_execution_units` host function.
 fn bench_spin_loop_v2(c: &mut Criterion) {
-    let code = wat2wasm(&include_local_wasm_str!("loop_v2.wat")).unwrap();
+    let code = wat2wasm(&include_local_wasm_str!("loop_v2.wat"));
     let mut ledger = LedgerSimulatorBuilder::new().build();
     let package_address = ledger.publish_package_simple(PackagePublishingSource::PublishExisting(
         code,
@@ -337,7 +336,7 @@ macro_rules! bench_instantiate {
             c.bench_function(concat!("costing::instantiate_", $what), |b| {
                 b.iter(|| {
                     let wasm_engine = DefaultWasmEngine::default();
-                    wasm_engine.instantiate(CodeHash(Hash([0u8; 32])), &instrumented_code);
+                    wasm_engine.instantiate(CodeHash(Hash([0u8; 32])), &instrumented_code, ScryptoVmVersion::latest());
                 })
             });
 
diff --git a/radix-engine/src/vm/wasm/wasm_validator.rs b/radix-engine/src/vm/wasm/wasm_validator.rs
index a36e8853286..76b49570393 100644
--- a/radix-engine/src/vm/wasm/wasm_validator.rs
+++ b/radix-engine/src/vm/wasm/wasm_validator.rs
@@ -120,8 +120,6 @@ mod tests {
         )
         .unwrap();
 
-        println!("{}", instrumented_code);
-
         assert_eq!(
             instrumented_code,
             r#"(module