From 01a43460cdce2e18ba8bef42dfb90e19fb611905 Mon Sep 17 00:00:00 2001 From: ade Date: Tue, 22 Feb 2022 21:27:02 -0500 Subject: [PATCH 1/2] Clean up some logic --- sui_core/src/unit_tests/authority_tests.rs | 1 - sui_types/src/object.rs | 32 ++++++++++------------ 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/sui_core/src/unit_tests/authority_tests.rs b/sui_core/src/unit_tests/authority_tests.rs index cf15fe515536f..14feb9552b9fa 100644 --- a/sui_core/src/unit_tests/authority_tests.rs +++ b/sui_core/src/unit_tests/authority_tests.rs @@ -1493,7 +1493,6 @@ async fn test_hero() { ) .await .unwrap(); - println!("ERRRR {:?}", effects.status); assert!(matches!(effects.status, ExecutionStatus::Success { .. })); // 7. Give them a boar! diff --git a/sui_types/src/object.rs b/sui_types/src/object.rs index 00850a18ac210..950c0be68247c 100644 --- a/sui_types/src/object.rs +++ b/sui_types/src/object.rs @@ -174,7 +174,6 @@ impl MoveObject { // serde_bytes::ByteBuf is an analog of Vec with built-in fast serialization. #[derive(Eq, PartialEq, Debug, Clone, Deserialize, Serialize, Hash)] pub struct MovePackage { - id: ObjectID, module_map: BTreeMap, } @@ -184,22 +183,21 @@ impl MovePackage { } pub fn from_map(module_map: &BTreeMap) -> Self { - // All modules in the same package must have the same address. Pick any - let id = ObjectID::from( - *CompiledModule::deserialize(module_map.values().next().unwrap()) - .unwrap() - .self_id() - .address(), - ); - Self { - id, module_map: module_map.clone(), } } pub fn id(&self) -> ObjectID { - self.id + // TODO: simplify this + // https://github.com/MystenLabs/fastnft/issues/249 + // All modules in the same package must have the same address. Pick any + ObjectID::from( + *CompiledModule::deserialize(self.module_map.values().next().unwrap()) + .unwrap() + .self_id() + .address(), + ) } pub fn module_id(&self, module: &Identifier) -> Result { @@ -236,10 +234,9 @@ impl MovePackage { }) } } -impl TryFrom<&Vec> for MovePackage { - type Error = SuiError; - fn try_from(compiled_modules: &Vec) -> Result { - let package = MovePackage::from_map( +impl From<&Vec> for MovePackage { + fn from(compiled_modules: &Vec) -> Self { + MovePackage::from_map( &compiled_modules .iter() .map(|module| { @@ -248,8 +245,7 @@ impl TryFrom<&Vec> for MovePackage { (module.self_id().name().to_string(), ByteBuf::from(bytes)) }) .collect(), - ); - Ok(package) + ) } } @@ -372,7 +368,7 @@ impl Object { previous_transaction: TransactionDigest, ) -> Result { Ok(Object { - data: Data::Package(MovePackage::try_from(&modules)?), + data: Data::Package(MovePackage::from(&modules)), owner, previous_transaction, }) From a928c5e99c7a42b69576e53d1fd712feb0b17db8 Mon Sep 17 00:00:00 2001 From: ade Date: Tue, 22 Feb 2022 21:39:08 -0500 Subject: [PATCH 2/2] Removed unused Error type --- sui/src/sui_commands.rs | 6 +++--- sui_programmability/adapter/src/adapter.rs | 2 +- sui_programmability/adapter/src/genesis.rs | 4 ++-- sui_types/src/object.rs | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sui/src/sui_commands.rs b/sui/src/sui_commands.rs index 0f02ea26308da..ac0ec3b2751fc 100644 --- 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_programmability/adapter/src/adapter.rs b/sui_programmability/adapter/src/adapter.rs index ff30466746d65..36152a2952cc8 100644 --- a/sui_programmability/adapter/src/adapter.rs +++ b/sui_programmability/adapter/src/adapter.rs @@ -291,7 +291,7 @@ pub fn publish + ModuleResolver SuiResult { sui_framework::get_move_stdlib_modules(&lib_dir.join("deps").join("move-stdlib"))?; let owner = SuiAddress::default(); let objects = vec![ - Object::new_package(sui_modules, owner, TransactionDigest::genesis())?, - Object::new_package(std_modules, owner, TransactionDigest::genesis())?, + Object::new_package(sui_modules, owner, TransactionDigest::genesis()), + Object::new_package(std_modules, owner, TransactionDigest::genesis()), ]; Ok(Genesis { objects }) } diff --git a/sui_types/src/object.rs b/sui_types/src/object.rs index 950c0be68247c..d4d85f955f7af 100644 --- a/sui_types/src/object.rs +++ b/sui_types/src/object.rs @@ -366,12 +366,12 @@ impl Object { modules: Vec, owner: SuiAddress, previous_transaction: TransactionDigest, - ) -> Result { - Ok(Object { + ) -> Self { + Object { data: Data::Package(MovePackage::from(&modules)), owner, previous_transaction, - }) + } } pub fn is_read_only(&self) -> bool {