Revert "[sui-adapter] Add basic package cache (#22099)"

This reverts commit 4a38dd7.

Author: Timothy Zakian

sui-execution/latest/sui-adapter/src/data_store/cached_data_store.rs

@@ -5,7 +5,6 @@
 extern crate sui_types;
 
 pub mod adapter;
-pub mod data_store;
 pub mod error;
 pub mod execution_engine;
 pub mod execution_mode;

sui-execution/latest/sui-adapter/src/data_store/mod.rs

@@ -7,10 +7,6 @@ pub use checked::*;
 mod checked {
     use crate::{
         adapter::new_native_extensions,
-        data_store::{
-            PackageStore, cached_data_store::CachedPackageStore, linkage_view::LinkageView,
-            sui_data_store::SuiDataStore,
-        },
         error::convert_vm_error,
         execution_mode::ExecutionMode,
         execution_value::{
@@ -19,6 +15,10 @@ mod checked {
         },
         gas_charger::GasCharger,
         gas_meter::SuiGasMeter,
+        programmable_transactions::{
+            data_store::{PackageStore, SuiDataStore},
+            linkage_view::LinkageView,
+        },
         type_resolver::TypeTagResolver,
     };
     use move_binary_format::{
@@ -147,9 +147,7 @@ mod checked {
         where
             'a: 'state,
         {
-            let mut linkage_view = LinkageView::new(Box::new(CachedPackageStore::new(Box::new(
-                state_view.as_sui_resolver(),
-            ))));
+            let mut linkage_view = LinkageView::new(Box::new(state_view.as_sui_resolver()));
             let mut input_object_map = BTreeMap::new();
             let inputs = inputs
                 .into_iter()

sui-execution/latest/sui-adapter/src/lib.rs

@@ -1,15 +1,17 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::data_store::{PackageStore, linkage_view::LinkageView};
+use crate::programmable_transactions::linkage_view::LinkageView;
 use move_binary_format::errors::{Location, PartialVMError, PartialVMResult, VMResult};
 use move_core_types::{
     account_address::AccountAddress, identifier::IdentStr, language_storage::ModuleId,
     resolver::ModuleResolver, vm_status::StatusCode,
 };
 use move_vm_types::data_store::DataStore;
 use std::rc::Rc;
-use sui_types::{base_types::ObjectID, error::SuiResult, move_package::MovePackage};
+use sui_types::{
+    base_types::ObjectID, error::SuiResult, move_package::MovePackage, storage::BackingPackageStore,
+};
 
 // Implementation of the `DataStore` trait for the Move VM.
 // When used during execution it may have a list of new packages that have
@@ -99,6 +101,21 @@ impl DataStore for SuiDataStore<'_, '_> {
     }
 }
 
+// A unifying trait that allows us to load move packages that may not be objects just yet (e.g., if
+// they were published in the current transaction). Note that this needs to load `MovePackage`s and
+// not `MovePackageObject`s.
+pub trait PackageStore {
+    fn get_package(&self, id: &ObjectID) -> SuiResult<Option<Rc<MovePackage>>>;
+}
+
+impl<T: BackingPackageStore> PackageStore for T {
+    fn get_package(&self, id: &ObjectID) -> SuiResult<Option<Rc<MovePackage>>> {
+        Ok(self
+            .get_package_object(id)?
+            .map(|x| Rc::new(x.move_package().clone())))
+    }
+}
+
 impl PackageStore for SuiDataStore<'_, '_> {
     fn get_package(&self, id: &ObjectID) -> SuiResult<Option<Rc<MovePackage>>> {
         for package in self.new_packages {

sui-execution/latest/sui-adapter/src/programmable_transactions/context.rs

@@ -7,14 +7,13 @@ pub use checked::*;
 mod checked {
     use crate::{
         adapter::substitute_package_id,
-        data_store::sui_data_store::SuiDataStore,
         execution_mode::ExecutionMode,
         execution_value::{
             CommandKind, ExecutionState, ObjectContents, ObjectValue, RawValueType, Value,
             ensure_serialized_size,
         },
         gas_charger::GasCharger,
-        programmable_transactions::context::*,
+        programmable_transactions::{context::*, data_store::SuiDataStore},
         type_resolver::TypeTagResolver,
     };
     use move_binary_format::file_format::AbilitySet;

sui-execution/latest/sui-adapter/src/data_store/sui_data_store.rs renamed to sui-execution/latest/sui-adapter/src/programmable_transactions/data_store.rs

@@ -1,7 +1,7 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::data_store::PackageStore;
+use crate::programmable_transactions::data_store::PackageStore;
 use move_core_types::{
     account_address::AccountAddress,
     identifier::{IdentStr, Identifier},

sui-execution/latest/sui-adapter/src/programmable_transactions/execution.rs

@@ -2,4 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 pub mod context;
+pub mod data_store;
 pub mod execution;
+pub mod linkage_view;

sui-execution/latest/sui-adapter/src/data_store/linkage_view.rs renamed to sui-execution/latest/sui-adapter/src/programmable_transactions/linkage_view.rs

@@ -1,9 +1,8 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::data_store::cached_data_store::CachedPackageStore;
-use crate::data_store::linkage_view::LinkageView;
 use crate::programmable_transactions::context::load_type_from_struct;
+use crate::programmable_transactions::linkage_view::LinkageView;
 use move_core_types::annotated_value as A;
 use move_core_types::language_storage::StructTag;
 use move_vm_runtime::move_vm::MoveVM;
@@ -27,9 +26,7 @@ struct NullSuiResolver<'state>(Box<dyn TypeLayoutStore + 'state>);
 
 impl<'state, 'vm> TypeLayoutResolver<'state, 'vm> {
     pub fn new(vm: &'vm MoveVM, state_view: Box<dyn TypeLayoutStore + 'state>) -> Self {
-        let linkage_view = LinkageView::new(Box::new(CachedPackageStore::new(Box::new(
-            NullSuiResolver(state_view),
-        ))));
+        let linkage_view = LinkageView::new(Box::new(NullSuiResolver(state_view)));
         Self { vm, linkage_view }
     }
 }