Merge pull request #915 from multiversx/vm-hooks-refactor-gen

vmHooks refactor, mutable self generation

Author: andrei-marinica

vmhost/vmhooks/generate/eiGenWriteRustCapiVMHooks.go

@@ -28,11 +28,11 @@ impl CapiVMHooks {
         }
     }
 
-    fn convert_mem_ptr(&self, mem_ptr: MemPtr) -> i32 {
+    fn convert_mem_ptr(&mut self, mem_ptr: MemPtr) -> i32 {
         mem_ptr as i32
     }
 
-    fn convert_mem_length(&self, mem_length: MemLength) -> i32 {
+    fn convert_mem_length(&mut self, mem_length: MemLength) -> i32 {
         mem_length as i32
     }
 }
@@ -49,7 +49,7 @@ impl multiversx_chain_vm_executor::VMHooks for CapiVMHooks {
 			"\n    fn %s%s {\n",
 			snakeCase(funcMetadata.Name),
 			writeRustFnDeclarationArguments(
-				"&self",
+				"&mut self",
 				funcMetadata,
 				rustVMHooksType,
 			),

vmhost/vmhooks/generate/eiGenWriteRustCapiVMHooksPointers.go

@@ -11,6 +11,7 @@ use std::ffi::c_void;
 
 #[repr(C)]
 #[derive(Clone)]
+#[allow(non_camel_case_types)]
 #[rustfmt::skip]
 pub struct vm_exec_vm_hook_c_func_pointers {`)
 

vmhost/vmhooks/generate/eiGenWriteRustVMHooksTrait.go

@@ -14,7 +14,7 @@ use crate::{MemLength, MemPtr};
 
 #[rustfmt::skip]
 #[allow(clippy::too_many_arguments)]
-pub trait VMHooks: core::fmt::Debug + 'static {
+pub trait VMHooks: core::fmt::Debug {
     fn set_vm_hooks_ptr(&mut self, vm_hooks_ptr: *mut c_void);
 
 `)
@@ -24,7 +24,7 @@ pub trait VMHooks: core::fmt::Debug + 'static {
 			"    fn %s%s;\n",
 			snakeCase(funcMetadata.Name),
 			writeRustFnDeclarationArguments(
-				"&self",
+				"&mut self",
 				funcMetadata,
 				rustVMHooksType,
 			),
@@ -54,7 +54,7 @@ impl VMHooks for VMHooksDefault {
 			"    fn %s%s {\n",
 			snakeCase(funcMetadata.Name),
 			writeRustFnDeclarationArguments(
-				"&self",
+				"&mut self",
 				funcMetadata,
 				rustVMHooksType,
 			),

vmhost/vmhooks/generate/eiGenWriteRustWasmerProdImports.go

@@ -29,7 +29,7 @@ use crate::wasmer_vm_hooks::VMHooksWrapper;
 		))
 
 		out.WriteString(" {\n")
-		out.WriteString(fmt.Sprintf("    env.vm_hooks.%s(", snakeCase(funcMetadata.Name)))
+		out.WriteString(fmt.Sprintf("    env.with_vm_hooks(|vh| vh.%s(", snakeCase(funcMetadata.Name)))
 
 		for i, arg := range funcMetadata.Arguments {
 			if i > 0 {
@@ -38,7 +38,7 @@ use crate::wasmer_vm_hooks::VMHooksWrapper;
 			out.WriteString(rustWasmerProdConvertArg(arg))
 		}
 
-		out.WriteString(")\n}\n\n")
+		out.WriteString("))\n}\n\n")
 	}
 
 	out.WriteString(`pub fn generate_import_object(store: &Store, env: &VMHooksWrapper) -> ImportObject {