Resond to feedback

Signed-off-by: James Sturtevant <jsturtevant@gmail.com>

Author: jsturtevant

src/hyperlight_wasm/src/sandbox/proto_wasm_sandbox.rs

@@ -16,7 +16,6 @@ limitations under the License.
 
 use std::collections::HashMap;
 
-use hyperlight_common::flatbuffer_wrappers::function_types::{ParameterType, ReturnType};
 use hyperlight_common::flatbuffer_wrappers::host_function_definition::HostFunctionDefinition;
 use hyperlight_common::flatbuffer_wrappers::host_function_details::HostFunctionDetails;
 use hyperlight_host::func::{HostFunction, ParameterTuple, Registerable, SupportedReturnType};
@@ -52,7 +51,14 @@ impl Registerable for ProtoWasmSandbox {
 
         // Track the host function definition for pushing to guest at load time.
         // matching hyperlight-core's FunctionRegistry behavior.
-        self.track_host_function_definition(name, Args::TYPE, Output::TYPE);
+        self.host_function_definitions.insert(
+            name.to_string(),
+            HostFunctionDefinition {
+                function_name: name.to_string(),
+                parameter_types: Some(Args::TYPE.to_vec()),
+                return_type: Output::TYPE,
+            },
+        );
         Ok(())
     }
 }
@@ -129,29 +135,7 @@ impl ProtoWasmSandbox {
         name: impl AsRef<str>,
         host_func: impl Into<HostFunction<Output, Args>>,
     ) -> Result<()> {
-        self.inner
-            .as_mut()
-            .ok_or(new_error!("inner sandbox was none"))?
-            .register(&name, host_func)?;
-
-        self.track_host_function_definition(name.as_ref(), Args::TYPE, Output::TYPE);
-        Ok(())
-    }
-
-    fn track_host_function_definition(
-        &mut self,
-        name: &str,
-        parameter_types: &[ParameterType],
-        return_type: ReturnType,
-    ) {
-        self.host_function_definitions.insert(
-            name.to_string(),
-            HostFunctionDefinition {
-                function_name: name.to_string(),
-                parameter_types: Some(parameter_types.to_vec()),
-                return_type,
-            },
-        );
+        self.register_host_function(name.as_ref(), host_func)
     }
 
     /// Register the given host printing function `print_func` with `self`.

src/hyperlight_wasm/src/sandbox/sandbox_builder.rs

@@ -20,9 +20,7 @@ use hyperlight_host::{GuestBinary, HyperlightError, Result, is_hypervisor_presen
 
 use super::proto_wasm_sandbox::ProtoWasmSandbox;
 
-// use unreasonably large minimum stack/heap/input data sizes for now to
-// deal with the size of wasmtime/wasi-libc aot artifacts
-// use reasonably large minimum scratch/heap/input data sizes
+// use large minimum scratch/heap/input data sizes
 // to deal with the size of wasmtime/wasi-libc aot artifacts
 pub const MIN_SCRATCH_SIZE: usize = 2 * 1024 * 1024;
 pub const MIN_INPUT_DATA_SIZE: usize = 192 * 1024;