temporary-store: don't require package store to be in an Arc

creulean · Jul 8, 2022 · 655940e · 655940e
1 parent 2ec4309
commit 655940e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/crates/sui-adapter/src/temporary_store.rs b/crates/sui-adapter/src/temporary_store.rs
@@ -5,7 +5,6 @@ use move_core_types::account_address::AccountAddress;
 use move_core_types::language_storage::{ModuleId, StructTag};
 use move_core_types::resolver::{ModuleResolver, ResourceResolver};
 use std::collections::{BTreeMap, HashSet};
-use std::sync::Arc;
 use sui_types::base_types::{
     ObjectDigest, ObjectID, ObjectRef, SequenceNumber, SuiAddress, TransactionDigest,
 };
@@ -32,7 +31,7 @@ pub struct AuthorityTemporaryStore<S> {
     // The backing store for retrieving Move packages onchain.
     // When executing a Move call, the dependent packages are not going to be
     // in the input objects. They will be feteched from the backing store.
-    package_store: Arc<S>,
+    package_store: S,
     tx_digest: TransactionDigest,
     objects: BTreeMap<ObjectID, Object>,
     mutable_inputs: Vec<ObjectRef>, // Inputs that are mutable
@@ -50,7 +49,7 @@ impl<S> AuthorityTemporaryStore<S> {
     /// Creates a new store associated with an authority store, and populates it with
     /// initial objects.
     pub fn new(
-        package_store: Arc<S>,
+        package_store: S,
         input_objects: InputObjects,
         tx_digest: TransactionDigest,
     ) -> Self {

diff --git a/crates/sui-core/src/authority.rs b/crates/sui-core/src/authority.rs
@@ -581,7 +581,7 @@ impl AuthorityState {
         certificate: &CertifiedTransaction,
         transaction_digest: TransactionDigest,
     ) -> SuiResult<(
-        AuthorityTemporaryStore<AuthorityStore>,
+        AuthorityTemporaryStore<Arc<AuthorityStore>>,
         SignedTransactionEffects,
     )> {
         let (gas_status, input_objects) = transaction_input_checker::check_transaction_input(
@@ -1368,7 +1368,7 @@ impl AuthorityState {
     #[instrument(name = "commit_certificate", level = "debug", skip_all)]
     pub(crate) async fn commit_certificate(
         &self,
-        temporary_store: AuthorityTemporaryStore<AuthorityStore>,
+        temporary_store: AuthorityTemporaryStore<Arc<AuthorityStore>>,
         certificate: &CertifiedTransaction,
         signed_effects: &SignedTransactionEffects,
     ) -> SuiResult {

diff --git a/crates/sui-types/src/storage.rs b/crates/sui-types/src/storage.rs
@@ -42,3 +42,15 @@ pub trait Storage {
 pub trait BackingPackageStore {
     fn get_package(&self, package_id: &ObjectID) -> SuiResult<Option<Object>>;
 }
+
+impl<S: BackingPackageStore> BackingPackageStore for std::sync::Arc<S> {
+    fn get_package(&self, package_id: &ObjectID) -> SuiResult<Option<Object>> {
+        BackingPackageStore::get_package(self.as_ref(), package_id)
+    }
+}
+
+impl<S: BackingPackageStore> BackingPackageStore for &S {
+    fn get_package(&self, package_id: &ObjectID) -> SuiResult<Option<Object>> {
+        BackingPackageStore::get_package(*self, package_id)
+    }
+}