Fix benchmarks and no_std

radixdlt · Jan 24, 2025 · 7526e96 · 7526e96
1 parent 0185384
commit 7526e96
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git 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"
+target = "wasm32-unknown-unknown"
diff --git 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
@@ -120,8 +120,6 @@ mod tests {
         )
         .unwrap();
 
-        println!("{}", instrumented_code);
-
         assert_eq!(
             instrumented_code,
             r#"(module