Implement the Arbitrary fuzzing trait for contract value-types

soroban-env-common/Cargo.toml

@@ -20,12 +20,13 @@ wasmi = { workspace = true, optional = true }
 serde = { version = "1.0.0", features = ["derive"], optional = true }
 static_assertions = "1.1.0"
 ethnum = "1.3.2"
+arbitrary = { version = "1.1.3", features = ["derive"], optional = true }
 
 [features]
 std = ["stellar-xdr/std", "stellar-xdr/base64"]
 serde = ["dep:serde", "stellar-xdr/serde"]
 vm = ["wasmi"]
-testutils = []
+testutils = ["dep:arbitrary", "stellar-xdr/arbitrary"]
 
 [package.metadata.docs.rs]
 all-features = true

soroban-env-common/src/arbitrary.rs

@@ -0,0 +1,18 @@
+//! Implementations of [`Arbitrary`] for contract types.
+
+#![cfg(feature = "testutils")]
+
+extern crate alloc;
+
+use crate::xdr::ScStatus;
+use crate::Status;
+use arbitrary::{Arbitrary, Unstructured};
+
+impl<'a> Arbitrary<'a> for Status {
+    fn arbitrary(u: &mut Unstructured<'a>) -> arbitrary::Result<Self> {
+        let scstatus = ScStatus::arbitrary(u)?;
+        let status = Status::from(scstatus);
+
+        Ok(status)
+    }
+}

soroban-env-common/src/lib.rs

@@ -36,6 +36,7 @@ pub const VERSION: Version = Version {
 
 mod wrapper_macros;
 
+mod arbitrary;
 mod bytes;
 mod compare;
 mod convert;

soroban-env-host/src/host.rs

@@ -3040,16 +3040,11 @@ impl VmCallerEnv for Host {
 }
 
 #[cfg(any(test, feature = "testutils"))]
-mod testutils {
-    use crate::RawVal;
-    use std::any::Any;
+pub(crate) mod testutils {
     use std::cell::Cell;
-    use std::panic::UnwindSafe;
-    use std::panic::{catch_unwind, set_hook, take_hook};
+    use std::panic::{catch_unwind, set_hook, take_hook, UnwindSafe};
     use std::sync::Once;
 
-    type PanicVal = Box<dyn Any + Send>;
-
     /// Catch panics while suppressing the default panic hook that prints to the
     /// console.
     ///
@@ -3062,9 +3057,9 @@ mod testutils {
     /// hook. It then uses a thread local variable to track contract call depth.
     /// If a panick occurs during a contract call the original hook is not
     /// called, otherwise it is called.
-    pub fn call_with_suppressed_panic_hook<C>(closure: C) -> Result<Option<RawVal>, PanicVal>
+    pub fn call_with_suppressed_panic_hook<C, R>(closure: C) -> std::thread::Result<R>
     where
-        C: FnOnce() -> Option<RawVal> + UnwindSafe,
+        C: FnOnce() -> R + UnwindSafe,
     {
         thread_local! {
             static TEST_CONTRACT_CALL_COUNT: Cell<u64> = Cell::new(0);
@@ -3088,7 +3083,7 @@ mod testutils {
             c.set(new_count);
         });
 
-        let res: Result<Option<RawVal>, PanicVal> = catch_unwind(closure);
+        let res = catch_unwind(closure);
 
         TEST_CONTRACT_CALL_COUNT.with(|c| {
             let old_count = c.get();

soroban-env-host/src/lib.rs

@@ -46,6 +46,9 @@ pub mod storage;
 #[cfg(test)]
 mod test;
 
+#[cfg(any(test, feature = "testutils"))]
+#[doc(hidden)]
+pub use host::testutils::call_with_suppressed_panic_hook;
 #[cfg(any(test, feature = "testutils"))]
 pub use host::ContractFunctionSet;
 pub use host::{