fixup! Rename MutiUseSandbox -> Sandbox

Signed-off-by: Jorge Prendes <[email protected]>

Author: jprendes

src/hyperlight_host/benches/benchmarks.rs

@@ -16,9 +16,7 @@ limitations under the License.
 
 use criterion::{Criterion, criterion_group, criterion_main};
 use hyperlight_host::GuestBinary;
-use hyperlight_host::sandbox::{
-    Callable, Sandbox, SandboxConfiguration, UninitializedSandbox,
-};
+use hyperlight_host::sandbox::{Callable, Sandbox, SandboxConfiguration, UninitializedSandbox};
 use hyperlight_testing::simple_guest_as_string;
 
 fn create_uninit_sandbox() -> UninitializedSandbox {

src/hyperlight_host/src/sandbox/mod.rs

@@ -20,16 +20,16 @@ pub mod config;
 pub(crate) mod host_funcs;
 /// Functionality for dealing with `Sandbox`es that contain Hypervisors
 pub(crate) mod hypervisor;
-/// Functionality for dealing with initialized sandboxes that can
-/// call 0 or more guest functions
-pub mod sandbox;
 /// Functionality for dealing with memory access from the VM guest
 /// executable
 pub(crate) mod mem_access;
 /// Functionality for interacting with a sandbox's internally-stored
 /// `SandboxMemoryManager`
 pub(crate) mod mem_mgr;
 pub(crate) mod outb;
+/// Functionality for dealing with initialized sandboxes that can
+/// call 0 or more guest functions
+pub mod sandbox;
 /// Functionality for creating uninitialized sandboxes, manipulating them,
 /// and converting them to initialized sandboxes.
 pub mod uninitialized;

src/hyperlight_host/src/sandbox/sandbox.rs

@@ -327,7 +327,7 @@ mod tests {
     #[cfg(target_os = "linux")]
     use crate::mem::shared_mem::{ExclusiveSharedMemory, GuestSharedMemory, SharedMemory as _};
     use crate::sandbox::{Callable, SandboxConfiguration};
-    use crate::{GuestBinary, HyperlightError, Sandbox, Result, UninitializedSandbox};
+    use crate::{GuestBinary, HyperlightError, Result, Sandbox, UninitializedSandbox};
 
     // Tests to ensure that many (1000) function calls can be made in a call context with a small stack (1K) and heap(14K).
     // This test effectively ensures that the stack is being properly reset after each call and we are not leaking memory in the Guest.

src/hyperlight_host/src/sandbox/uninitialized.rs

@@ -34,7 +34,7 @@ use crate::mem::memory_region::{DEFAULT_GUEST_BLOB_MEM_FLAGS, MemoryRegionFlags}
 use crate::mem::mgr::{STACK_COOKIE_LEN, SandboxMemoryManager};
 use crate::mem::shared_mem::ExclusiveSharedMemory;
 use crate::sandbox::SandboxConfiguration;
-use crate::{Sandbox, Result, new_error};
+use crate::{Result, Sandbox, new_error};
 
 #[cfg(all(target_os = "linux", feature = "seccomp"))]
 const EXTRA_ALLOWED_SYSCALLS_FOR_WRITER_FUNC: &[super::ExtraAllowedSyscall] = &[
@@ -410,7 +410,7 @@ mod tests {
 
     use crate::sandbox::SandboxConfiguration;
     use crate::sandbox::uninitialized::{GuestBinary, GuestEnvironment};
-    use crate::{Sandbox, Result, UninitializedSandbox, new_error};
+    use crate::{Result, Sandbox, UninitializedSandbox, new_error};
 
     #[test]
     fn test_load_extra_blob() {

src/hyperlight_host/src/sandbox/uninitialized_evolve.rs

@@ -43,7 +43,7 @@ use crate::sandbox::host_funcs::FunctionRegistry;
 use crate::sandbox::{HostSharedMemory, MemMgrWrapper};
 #[cfg(target_os = "linux")]
 use crate::signal_handlers::setup_signal_handlers;
-use crate::{Sandbox, Result, UninitializedSandbox, log_then_return, new_error};
+use crate::{Result, Sandbox, UninitializedSandbox, log_then_return, new_error};
 
 /// The implementation for evolving `UninitializedSandbox`es to
 /// `Sandbox`es.

src/hyperlight_host/tests/common/mod.rs

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 use hyperlight_host::func::HostFunction;
-use hyperlight_host::{GuestBinary, Sandbox, Result, UninitializedSandbox};
+use hyperlight_host::{GuestBinary, Result, Sandbox, UninitializedSandbox};
 use hyperlight_testing::{
     c_callback_guest_as_string, c_simple_guest_as_string, callback_guest_as_string,
     simple_guest_as_string,

src/hyperlight_host/tests/sandbox_host_tests.rs

@@ -21,7 +21,7 @@ use std::sync::{Arc, Mutex};
 use common::new_uninit;
 use hyperlight_host::sandbox::{Callable, SandboxConfiguration};
 use hyperlight_host::{
-    GuestBinary, HyperlightError, Sandbox, Result, UninitializedSandbox, new_error,
+    GuestBinary, HyperlightError, Result, Sandbox, UninitializedSandbox, new_error,
 };
 use hyperlight_testing::simple_guest_as_string;
 #[cfg(target_os = "windows")]