Merge pull request #330 from ethereum/rust-container-deref

rust: implement Deref trait for EvmcContainer
ethereum · Jun 25, 2019 · e6eab30 · e6eab30
2 parents 32acbfa + beea4e3
commit e6eab30
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/bindings/rust/evmc-declare/src/lib.rs b/bindings/rust/evmc-declare/src/lib.rs
@@ -334,6 +334,8 @@ fn build_execute_fn(names: &VMNameSet) -> proc_macro2::TokenStream {
             code_size: usize
         ) -> ::evmc_vm::ffi::evmc_result
         {
+            use evmc_vm::EvmcVm;
+
             assert!(!msg.is_null());
             assert!(!context.is_null());
             assert!(!instance.is_null());

diff --git a/bindings/rust/evmc-vm/src/container.rs b/bindings/rust/evmc-vm/src/container.rs
@@ -4,8 +4,8 @@
  */
 
 use crate::EvmcVm;
-use crate::ExecutionContext;
-use crate::ExecutionResult;
+
+use std::ops::Deref;
 
 /// Container struct for EVMC instances and user-defined data.
 pub struct EvmcContainer<T: EvmcVm + Sized> {
@@ -33,9 +33,15 @@ impl<T: EvmcVm + Sized> EvmcContainer<T> {
     pub unsafe fn into_ffi_pointer(boxed: Box<Self>) -> *const ::evmc_sys::evmc_instance {
         Box::into_raw(boxed) as *const ::evmc_sys::evmc_instance
     }
+}
+
+impl<T> Deref for EvmcContainer<T>
+where
+    T: EvmcVm,
+{
+    type Target = T;
 
-    // TODO: Maybe this can just be done with the Deref<Target = T> trait.
-    pub fn execute(&self, code: &[u8], context: &ExecutionContext) -> ExecutionResult {
-        self.vm.execute(code, context)
+    fn deref(&self) -> &Self::Target {
+        &self.vm
     }
 }