Move fuzz inside soroban-env-host

.cargo/config.toml

@@ -18,7 +18,7 @@
 # target = "triple"             # build for the target triple (ignored by `cargo install`)
 # target-dir = "target"         # path of where to place all generated artifacts
 rustflags = [
-     # "-Dwarnings",
+     "-Dwarnings",
      "-Aclippy::style",
 #    "-Dclippy::pedantic",
 #    "-Aclippy::module_name_repetitions",

Cargo.toml

@@ -11,7 +11,6 @@ members = [
     "soroban-test-wasms",
     "soroban-synth-wasm",
     "soroban-bench-utils",
-    "soroban-fuzz-host"
 ]
 
 exclude = ["soroban-test-wasms/wasm-workspace"]

soroban-env-host/benches/common/cost_types/compute_sha256_hash.rs

@@ -10,7 +10,7 @@ pub(crate) struct ComputeSha256HashMeasure;
 impl HostCostMeasurement for ComputeSha256HashMeasure {
     type Runner = ComputeSha256HashRun;
 
-    fn new_random_case(host: &Host, _rng: &mut StdRng, input: u64) -> Vec<u8> {
+    fn new_random_case(_host: &Host, _rng: &mut StdRng, input: u64) -> Vec<u8> {
         let size = 1 + input * Self::STEP_SIZE;
         (0..size).map(|n| n as u8).collect()
     }

soroban-fuzz-host/fuzz/Cargo.toml → soroban-env-host/fuzz/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "soroban-fuzz-host-fuzz"
+name = "soroban-env-host-fuzz"
 version = "0.0.0"
 publish = false
 edition = "2021"
@@ -9,9 +9,9 @@ cargo-fuzz = true
 
 [dependencies]
 libfuzzer-sys = "0.4"
-debug_logging = { path = "../debug_logging"}
-soroban-env-host = { path = "../../soroban-env-host", features = ["testutils"]}
 arbitrary = { version = "1.3.0", features = ["derive"] }
+soroban-env-host = { path = "..", features = ["testutils"]}
+soroban-synth-wasm = { path = "../../soroban-synth-wasm"}
 
 # Prevent this from interfering with workspaces
 [workspace]

soroban-fuzz-host/fuzz/fuzz_targets/fuzz_target_1.rs → soroban-env-host/fuzz/fuzz_targets/fuzz_target_1.rs

@@ -1,9 +1,9 @@
 #![no_main]
 
 use libfuzzer_sys::fuzz_target;
-use debug_logging::wasm_module_with_linear_memory_logging;
 use arbitrary::Arbitrary;
 use soroban_env_host::{Host, Symbol,  budget::AsBudget, Env};
+use soroban_env_host_fuzz::wasm_module_with_linear_memory_logging;
 
 #[derive(Arbitrary, Debug)]
 struct Input {
@@ -32,5 +32,5 @@ fuzz_target!(|input: Input| {
     let cpu = host.as_budget().get_cpu_insns_consumed().unwrap();
     let mem = host.as_budget().get_mem_bytes_consumed().unwrap();
 
-    assert_eq!((cpu,mem), (1075678, 203437) );
+    assert_eq!((cpu,mem), (1073488, 203274) );
 });

soroban-fuzz-host/debug_logging/src/lib.rs → soroban-env-host/fuzz/src/debug_log.rs

@@ -1,4 +1,3 @@
-use soroban_env_host::{Host, Symbol, SymbolSmall, budget::AsBudget, Env};
 use soroban_synth_wasm::{Arity, LocalRef, ModEmitter, Operand};
 
 pub fn wasm_module_with_linear_memory_logging() -> Vec<u8> {

soroban-env-host/fuzz/src/lib.rs

@@ -0,0 +1,2 @@
+pub mod debug_log;
+pub use debug_log::*;

soroban-env-host/src/host.rs

@@ -328,7 +328,7 @@ impl Host {
 
     #[cfg(any(test, feature = "testutils"))]
     pub(crate) fn source_account_id(&self) -> Result<Option<AccountId>, HostError> {
-        Ok(self.try_borrow_source_account()?.metered_clone(self)?)
+        self.try_borrow_source_account()?.metered_clone(self)
     }
 
     #[cfg(any(test, feature = "testutils"))]

soroban-env-host/src/testutils.rs

@@ -1,22 +1,20 @@
-use std::{cell::RefCell, collections::BTreeMap, rc::Rc};
+use std::{collections::BTreeMap, rc::Rc};
 
 use rand::RngCore;
 use soroban_env_common::{
     xdr::{
-        AccountEntry, AccountId, ContractCostType, LedgerEntry, LedgerEntryData, LedgerKey,
-        PublicKey, ScAddress, ScErrorCode, ScErrorType, ScVal, ScVec, Uint256,
+        AccountEntry, AccountId, LedgerEntry, LedgerEntryData, LedgerKey, PublicKey, ScAddress,
+        ScErrorCode, ScErrorType, ScVal, ScVec, Uint256,
     },
-    AddressObject, BytesObject, Env, EnvBase, Symbol, Val, VecObject,
+    AddressObject, BytesObject, Env, EnvBase, Val, VecObject,
 };
 
 use crate::{
-    budget::{AsBudget, Budget},
-    host::HostLifecycleEvent,
+    budget::Budget,
     storage::{SnapshotSource, Storage},
     xdr, Error, Host, HostError, LedgerInfo,
 };
 
-
 // Test utilities for the host, used in various tests in sub-modules.
 pub trait AsScVal {
     fn as_scval(&self) -> ScVal;
@@ -48,13 +46,14 @@ pub fn generate_account_id(host: &Host) -> AccountId {
 
 pub fn generate_bytes_array(host: &Host) -> [u8; 32] {
     let mut bytes: [u8; 32] = Default::default();
-    host.with_test_prng(|chacha| Ok(chacha.fill_bytes(&mut bytes)))
-        .unwrap();
+    host.with_test_prng(|chacha| {
+        chacha.fill_bytes(&mut bytes);
+        Ok(())
+    })
+    .unwrap();
     bytes
 }
 
-
-
 pub struct MockSnapshotSource(BTreeMap<Rc<LedgerKey>, (Rc<LedgerEntry>, Option<u32>)>);
 
 impl MockSnapshotSource {