Improve Move call type checking part1 (MystenLabs#529)

* Moved type checking to separate module
toxicoff · Feb 23, 2022 · ae20572 · ae20572
1 parent 7dd265d
commit ae20572
Show file tree

Hide file tree

Showing 12 changed files with 387 additions and 308 deletions.
diff --git a/sui/src/sui_commands.rs b/sui/src/sui_commands.rs
@@ -162,7 +162,7 @@ async fn genesis(
     );
     let sui_lib = sui_framework::get_sui_framework_modules(&genesis_conf.sui_framework_lib_path)?;
     let lib_object =
-        Object::new_package(sui_lib, SuiAddress::default(), TransactionDigest::genesis());
+        Object::new_package(sui_lib, SuiAddress::default(), TransactionDigest::genesis())?;
     preload_modules.push(lib_object);
 
     info!(
@@ -174,7 +174,7 @@ async fn genesis(
         move_lib,
         SuiAddress::default(),
         TransactionDigest::genesis(),
-    );
+    )?;
     preload_modules.push(lib_object);
 
     // Build custom move packages
@@ -194,7 +194,7 @@ async fn genesis(
             )?;
 
             let object =
-                Object::new_package(modules, SuiAddress::default(), TransactionDigest::genesis());
+                Object::new_package(modules, SuiAddress::default(), TransactionDigest::genesis())?;
             info!("Loaded package [{}] from {:?}.", object.id(), path);
             // Writing package id to network.conf for user to retrieve later.
             config.loaded_move_packages.push((path, object.id()));

diff --git a/sui_core/src/authority/authority_store.rs b/sui_core/src/authority/authority_store.rs
@@ -465,6 +465,7 @@ impl ModuleResolver for AuthorityStore {
         match self.get_object(&ObjectID::from(*module_id.address()))? {
             Some(o) => match &o.data {
                 Data::Package(c) => Ok(c
+                    .serialized_module_map()
                     .get(module_id.name().as_str())
                     .cloned()
                     .map(|m| m.into_vec())),

diff --git a/sui_core/src/authority/temporary_store.rs b/sui_core/src/authority/temporary_store.rs
@@ -268,6 +268,7 @@ impl ModuleResolver for AuthorityTemporaryStore {
         match self.read_object(&ObjectID::from(*module_id.address())) {
             Some(o) => match &o.data {
                 Data::Package(c) => Ok(c
+                    .serialized_module_map()
                     .get(module_id.name().as_str())
                     .cloned()
                     .map(|m| m.into_vec())),

diff --git a/sui_core/src/unit_tests/authority_tests.rs b/sui_core/src/unit_tests/authority_tests.rs
@@ -371,7 +371,9 @@ async fn test_publish_dependent_module_ok() {
     // create a genesis state that contains the gas object and genesis modules
     let genesis_module_objects = genesis::clone_genesis_modules();
     let genesis_module = match &genesis_module_objects[0].data {
-        Data::Package(m) => CompiledModule::deserialize(m.values().next().unwrap()).unwrap(),
+        Data::Package(m) => {
+            CompiledModule::deserialize(m.serialized_module_map().values().next().unwrap()).unwrap()
+        }
         _ => unreachable!(),
     };
     // create a module that depends on a genesis module
@@ -462,7 +464,9 @@ async fn test_publish_non_existing_dependent_module() {
     // create a genesis state that contains the gas object and genesis modules
     let genesis_module_objects = genesis::clone_genesis_modules();
     let genesis_module = match &genesis_module_objects[0].data {
-        Data::Package(m) => CompiledModule::deserialize(m.values().next().unwrap()).unwrap(),
+        Data::Package(m) => {
+            CompiledModule::deserialize(m.serialized_module_map().values().next().unwrap()).unwrap()
+        }
         _ => unreachable!(),
     };
     // create a module that depends on a genesis module
@@ -1489,6 +1493,7 @@ async fn test_hero() {
     )
     .await
     .unwrap();
+    println!("ERRRR   {:?}", effects.status);
     assert!(matches!(effects.status, ExecutionStatus::Success { .. }));
 
     // 7. Give them a boar!
@@ -1785,7 +1790,7 @@ fn get_genesis_package_by_module(genesis_objects: &[Object], module: &str) -> Ob
         .iter()
         .find_map(|o| match o.data.try_as_package() {
             Some(p) => {
-                if p.keys().any(|name| name == module) {
+                if p.serialized_module_map().keys().any(|name| name == module) {
                     Some(o.to_object_reference())
                 } else {
                     None