MoveResolverExt that depends on TableResolver

Closes: aptos-labs#448
arsadmin · Apr 7, 2022 · 2074cae · 2074cae
1 parent dc9ac7f
commit 2074cae
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aptos-move/aptos-vm/Cargo.toml b/aptos-move/aptos-vm/Cargo.toml
@@ -22,6 +22,7 @@ move-binary-format = { git = "https://github.com/diem/move", rev = "3fe033b112ea
 move-bytecode-utils = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
 move-core-types = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa", features=["address32"] }
 move-stdlib = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
+move-table-extension = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
 move-vm-runtime = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
 move-vm-types = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
 read-write-set-dynamic = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa"}

diff --git a/aptos-move/aptos-vm/src/move_vm_ext/mod.rs b/aptos-move/aptos-vm/src/move_vm_ext/mod.rs
@@ -3,10 +3,12 @@
 
 ///! MoveVM and Session wrapped, to make sure Aptos natives and extensions are always installed and
 ///! taken care of after session finish.
+mod resolver;
 mod session;
 mod vm;
 
 pub use crate::move_vm_ext::{
+    resolver::MoveResolverExt,
     session::{SessionExt, SessionId, SessionOutput},
     vm::MoveVmExt,
 };
diff --git a/aptos-move/aptos-vm/src/move_vm_ext/resolver.rs b/aptos-move/aptos-vm/src/move_vm_ext/resolver.rs
@@ -0,0 +1,14 @@
+// Copyright (c) Aptos
+// SPDX-License-Identifier: Apache-2.0
+
+use move_core_types::resolver::MoveResolver;
+use move_table_extension::TableResolver;
+use std::fmt::Debug;
+
+pub trait MoveResolverExt: MoveResolver<Err = Self::ExtError> + TableResolver {
+    type ExtError: Debug;
+}
+
+impl<E: Debug, T: MoveResolver<Err = E> + TableResolver + ?Sized> MoveResolverExt for T {
+    type ExtError = E;
+}