[starcoin vm] Fix some pr problem

starcoinorg · Jun 21, 2023 · 48065ba · 48065ba
1 parent a3012b3
commit 48065ba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/vm/vm-runtime/src/data_cache.rs b/vm/vm-runtime/src/data_cache.rs
@@ -135,7 +135,7 @@ impl<'a, S: StateView> ResourceResolver for RemoteStorage<'a, S> {
         self.get(&ap).map_err(|e| e.finish(Location::Undefined))
     }
 }
-
+// TODO Note for Conflicting: conflicting implementation in crate `starcoin_vm_types`: - impl<V> ConfigStorage for V where V: StateView;
 // impl<'a, S: StateView> ConfigStorage for RemoteStorage<'a, S> {
 //     fn fetch_config(&self, access_path: AccessPath) -> Option<Vec<u8>> {
 //         self.get(&access_path).ok()?
@@ -219,6 +219,7 @@ impl<S: StateView> TableResolver for RemoteStorageOwned<S> {
     }
 }
 
+// TODO Note for Conflicting: conflicting implementation in crate `starcoin_vm_types`: - impl<V> ConfigStorage for V where V: StateView;
 // impl<S: StateView> ConfigStorage for RemoteStorageOwned<S> {
 //     fn fetch_config(&self, access_path: AccessPath) -> Option<Vec<u8>> {
 //         self.as_move_resolver().fetch_config(access_path)

diff --git a/vm/vm-runtime/src/starcoin_vm.rs b/vm/vm-runtime/src/starcoin_vm.rs
@@ -896,7 +896,6 @@ impl StarcoinVM {
             MoveValue::U8(chain_id.id()),
             MoveValue::U64(parent_gas_used),
         ]);
-        //let data_cache = remote_cache.as_move_resolver();
         let mut session: SessionAdapter<_> = self.move_vm.new_session(storage, session_id).into();
         session
             .as_mut()
@@ -1000,7 +999,7 @@ impl StarcoinVM {
         storage: &S,
         txn: DryRunTransaction,
     ) -> Result<(VMStatus, TransactionOutput)> {
-        // load config by config change event.
+        // TODO load config by config change event.
         self.load_configs(&storage)?;
 
         let gas_params = match self.get_gas_parameters() {
@@ -1076,7 +1075,8 @@ impl StarcoinVM {
     ) -> Result<Vec<(VMStatus, TransactionOutput)>> {
         let mut data_cache = StateViewCache::new(storage);
         let mut result = vec![];
-        // load config by config change event
+
+        // TODO load config by config change event
         self.load_configs(&data_cache)?;
 
         let mut gas_left = block_gas_limit.unwrap_or(u64::MAX);
@@ -1115,7 +1115,7 @@ impl StarcoinVM {
                             // Push write set to write set
                             data_cache.push_write_set(output.write_set())
                         }
-                        // load config by config change event
+                        // TODO load config by config change event
                         self.check_reconfigure(&data_cache, &output)?;
 
                         #[cfg(feature = "metrics")]
@@ -1307,7 +1307,6 @@ impl StarcoinVM {
         storage: &S,
     ) -> (VMStatus, TransactionOutput) {
         gas_meter.set_metering(false);
-        //let data_cache = remote_cache.as_move_resolver();
         let mut session: SessionAdapter<_> = self
             .move_vm
             .new_session(storage, SessionId::txn_meta(txn_data))