[chore] implement GetModule for all ModuleResolvers (#935)

This allows us to use GetModule with less boilerplate in some other places where it's needed

Author: sblackshear

language/tools/move-bytecode-utils/src/module_cache.rs

@@ -67,6 +67,39 @@ impl<R: ModuleResolver> GetModule for ModuleCache<R> {
     }
 }
 
+impl<R: ModuleResolver> GetModule for &R {
+    type Error = R::Error;
+    type Item = CompiledModule;
+
+    fn get_module_by_id(&self, id: &ModuleId) -> Result<Option<CompiledModule>, Self::Error> {
+        Ok(self
+            .get_module(id)
+            .unwrap()
+            .map(|bytes| CompiledModule::deserialize(&bytes).unwrap()))
+    }
+}
+
+impl<R: ModuleResolver> GetModule for &mut R {
+    type Error = R::Error;
+    type Item = CompiledModule;
+
+    fn get_module_by_id(&self, id: &ModuleId) -> Result<Option<CompiledModule>, Self::Error> {
+        Ok(self
+            .get_module(id)
+            .unwrap()
+            .map(|bytes| CompiledModule::deserialize(&bytes).unwrap()))
+    }
+}
+
+impl<T: GetModule> GetModule for Arc<T> {
+    type Error = T::Error;
+    type Item = T::Item;
+
+    fn get_module_by_id(&self, id: &ModuleId) -> Result<Option<T::Item>, Self::Error> {
+        self.as_ref().get_module_by_id(id)
+    }
+}
+
 /// Simple in-memory module cache that implements Sync
 pub struct SyncModuleCache<R: ModuleResolver> {
     cache: RwLock<BTreeMap<ModuleId, Arc<CompiledModule>>>,

language/tools/move-cli/src/sandbox/utils/on_disk_state_view.rs

@@ -419,21 +419,6 @@ impl ResourceResolver for OnDiskStateView {
     }
 }
 
-impl GetModule for &OnDiskStateView {
-    type Error = anyhow::Error;
-    type Item = CompiledModule;
-
-    fn get_module_by_id(&self, id: &ModuleId) -> Result<Option<CompiledModule>, Self::Error> {
-        if let Some(bytes) = self.get_module_bytes(id)? {
-            let module = CompiledModule::deserialize(&bytes)
-                .map_err(|e| anyhow!("Failure deserializing module {:?}: {:?}", id, e))?;
-            Ok(Some(module))
-        } else {
-            Ok(None)
-        }
-    }
-}
-
 impl Default for OnDiskStateView {
     fn default() -> Self {
         OnDiskStateView::create(Path::new(DEFAULT_BUILD_DIR), Path::new(DEFAULT_STORAGE_DIR))