From 89b9fd9579cb837006664e49fa64297b7ea6f051 Mon Sep 17 00:00:00 2001
From: patrick <patrickkuo@me.com>
Date: Thu, 1 Dec 2022 11:21:20 +0000
Subject: [PATCH] fixup after rebase

---
 crates/sui-core/src/authority/authority_store.rs | 16 ++++------------
 .../src/unit_tests/move_integration_tests.rs     |  1 +
 crates/sui-json-rpc/src/api.rs                   |  8 ++++----
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/crates/sui-core/src/authority/authority_store.rs b/crates/sui-core/src/authority/authority_store.rs
index a63d2bbfea417..f7dc0f8fbee43 100644
--- a/crates/sui-core/src/authority/authority_store.rs
+++ b/crates/sui-core/src/authority/authority_store.rs
@@ -11,6 +11,7 @@ use arc_swap::ArcSwap;
 use move_binary_format::CompiledModule;
 use move_bytecode_utils::module_cache::GetModule;
 use once_cell::sync::OnceCell;
+use parking_lot::RwLock;
 use rocksdb::Options;
 use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
@@ -1276,17 +1277,8 @@ impl<S: Eq + Debug + Serialize + for<'de> Deserialize<'de>> SuiDataStore<S> {
         let modified_object_keys = effects
             .modified_at_versions
             .iter()
-            .map(|(r, _)| r)
-            .chain(effects.deleted.iter())
-            .chain(effects.wrapped.iter())
-            .map(|(id, version, _)| {
-                ObjectKey(
-                    *id,
-                    version
-                        .decrement()
-                        .expect("version revert should never fail"),
-                )
-            });
+            .map(|(id, version)| ObjectKey(*id, *version));
+
         let (old_objects_and_locks, old_dynamic_fields): (Vec<_>, Vec<_>) = self
             .perpetual_tables
             .objects
@@ -1310,7 +1302,7 @@ impl<S: Eq + Debug + Serialize + for<'de> Deserialize<'de>> SuiDataStore<S> {
             })
             .unzip();
 
-        let (old_objects, old_locks): (Vec<_>, Vec<_>) =
+        let (old_modified_objects, old_locks): (Vec<_>, Vec<_>) =
             old_objects_and_locks.into_iter().flatten().unzip();
         let old_dynamic_fields = old_dynamic_fields
             .into_iter()
diff --git a/crates/sui-core/src/unit_tests/move_integration_tests.rs b/crates/sui-core/src/unit_tests/move_integration_tests.rs
index e246915e55919..57b37db0e6a7f 100644
--- a/crates/sui-core/src/unit_tests/move_integration_tests.rs
+++ b/crates/sui-core/src/unit_tests/move_integration_tests.rs
@@ -25,6 +25,7 @@ use sui_types::{
 
 use std::path::PathBuf;
 use std::{env, str::FromStr};
+use sui_types::object::Owner;
 
 const MAX_GAS: u64 = 10000;
 
diff --git a/crates/sui-json-rpc/src/api.rs b/crates/sui-json-rpc/src/api.rs
index 63ff4cd2f8e07..a1309998561ac 100644
--- a/crates/sui-json-rpc/src/api.rs
+++ b/crates/sui-json-rpc/src/api.rs
@@ -9,10 +9,10 @@ use jsonrpsee_proc_macros::rpc;
 use fastcrypto::encoding::Base64;
 use sui_json::SuiJsonValue;
 use sui_json_rpc_types::{
-    EventPage, GetObjectDataResponse, GetPastObjectDataResponse, GetRawObjectDataResponse,
-    MoveFunctionArgType, RPCTransactionRequestParams, SuiCoinMetadata, SuiEventEnvelope,
-    SuiEventFilter, SuiExecuteTransactionResponse, SuiGasCostSummary, SuiMoveNormalizedFunction,
-    SuiMoveNormalizedModule, SuiMoveNormalizedStruct, SuiObjectInfo,
+    DynamicFieldPage, EventPage, GetObjectDataResponse, GetPastObjectDataResponse,
+    GetRawObjectDataResponse, MoveFunctionArgType, RPCTransactionRequestParams, SuiCoinMetadata,
+    SuiEventEnvelope, SuiEventFilter, SuiExecuteTransactionResponse, SuiGasCostSummary,
+    SuiMoveNormalizedFunction, SuiMoveNormalizedModule, SuiMoveNormalizedStruct, SuiObjectInfo,
     SuiTransactionAuthSignersResponse, SuiTransactionEffects, SuiTransactionFilter,
     SuiTransactionResponse, SuiTypeTag, TransactionBytes, TransactionsPage,
 };