chore: update notarization methods to remove package ID parameter and improve readability

Author: itsyaasir

.gitignore

@@ -4,4 +4,7 @@
 **/build
 
 .vscode
-*.code-workspace
+*.code-workspace
+
+.idea
+.DS_Store

notarization-rs/src/client/read_only.rs

@@ -175,7 +175,7 @@ impl NotarizationClientReadOnly {
     /// # Returns
     /// A `Result` containing the timestamp as a `u64` or an [`Error`].
     pub async fn last_state_change_ts(&self, notarized_object_id: ObjectID) -> Result<u64, Error> {
-        let tx = NotarizationImpl::last_change_ts(self.notarization_pkg_id, notarized_object_id, self).await?;
+        let tx = NotarizationImpl::last_change_ts(notarized_object_id, self).await?;
 
         self.execute_read_only_transaction(tx).await
     }
@@ -191,7 +191,7 @@ impl NotarizationClientReadOnly {
     /// # Returns
     /// A `Result` containing the timestamp as a `u64` or an [`Error`].
     pub async fn created_at_ts(&self, notarized_object_id: ObjectID) -> Result<u64, Error> {
-        let tx = NotarizationImpl::created_at(self.notarization_pkg_id, notarized_object_id, self).await?;
+        let tx = NotarizationImpl::created_at(notarized_object_id, self).await?;
 
         self.execute_read_only_transaction(tx).await
     }
@@ -207,7 +207,7 @@ impl NotarizationClientReadOnly {
     /// # Returns
     /// A `Result` containing the version count as a `u64` or an [`Error`].
     pub async fn state_version_count(&self, notarized_object_id: ObjectID) -> Result<u64, Error> {
-        let tx = NotarizationImpl::version_count(self.notarization_pkg_id, notarized_object_id, self).await?;
+        let tx = NotarizationImpl::version_count(notarized_object_id, self).await?;
 
         self.execute_read_only_transaction(tx).await
     }
@@ -223,7 +223,7 @@ impl NotarizationClientReadOnly {
     /// # Returns
     /// A `Result` containing an `Option<String>` or an [`Error`]. `None` if no description is set.
     pub async fn description(&self, notarized_object_id: ObjectID) -> Result<Option<String>, Error> {
-        let tx = NotarizationImpl::description(self.notarization_pkg_id, notarized_object_id, self).await?;
+        let tx = NotarizationImpl::description(notarized_object_id, self).await?;
 
         self.execute_read_only_transaction(tx).await
     }
@@ -239,7 +239,7 @@ impl NotarizationClientReadOnly {
     /// # Returns
     /// A `Result` containing an `Option<String>` or an [`Error`]. `None` if no updatable metadata is set.
     pub async fn updatable_metadata(&self, notarized_object_id: ObjectID) -> Result<Option<String>, Error> {
-        let tx = NotarizationImpl::updatable_metadata(self.notarization_pkg_id, notarized_object_id, self).await?;
+        let tx = NotarizationImpl::updatable_metadata(notarized_object_id, self).await?;
 
         self.execute_read_only_transaction(tx).await
     }
@@ -255,7 +255,7 @@ impl NotarizationClientReadOnly {
     /// # Returns
     /// A `Result` containing the [`NotarizationMethod`] or an [`Error`].
     pub async fn notarization_method(&self, notarized_object_id: ObjectID) -> Result<NotarizationMethod, Error> {
-        let tx = NotarizationImpl::notarization_method(self.notarization_pkg_id, notarized_object_id, self).await?;
+        let tx = NotarizationImpl::notarization_method(notarized_object_id, self).await?;
         self.execute_read_only_transaction(tx).await
     }
 
@@ -270,7 +270,7 @@ impl NotarizationClientReadOnly {
     /// # Returns
     /// A `Result` containing an `Option<LockMetadata>` or an [`Error`]. `None` if no locks are set.
     pub async fn lock_metadata(&self, notarized_object_id: ObjectID) -> Result<Option<LockMetadata>, Error> {
-        let tx = NotarizationImpl::lock_metadata(self.notarization_pkg_id, notarized_object_id, self).await?;
+        let tx = NotarizationImpl::lock_metadata(notarized_object_id, self).await?;
 
         self.execute_read_only_transaction(tx).await
     }
@@ -294,7 +294,7 @@ impl NotarizationClientReadOnly {
         let type_tag = move_utils::get_type_tag(self, &notarized_object_id).await?;
         let type_str = type_tag.to_string();
 
-        let tx = NotarizationImpl::state(self.notarization_pkg_id, notarized_object_id, self).await?;
+        let tx = NotarizationImpl::state(notarized_object_id, self).await?;
 
         if type_str == "vector<u8>" {
             let state: State<Vec<u8>> = self.execute_read_only_transaction(tx).await?;
@@ -323,7 +323,7 @@ impl NotarizationClientReadOnly {
     /// # Returns
     /// A `Result` containing the [`State<T>`] or an [`Error`].
     pub async fn state_as<T: DeserializeOwned>(&self, notarized_object_id: ObjectID) -> Result<State<T>, Error> {
-        let tx = NotarizationImpl::state(self.notarization_pkg_id, notarized_object_id, self).await?;
+        let tx = NotarizationImpl::state(notarized_object_id, self).await?;
 
         self.execute_read_only_transaction(tx).await
     }
@@ -337,7 +337,7 @@ impl NotarizationClientReadOnly {
     /// # Returns
     /// A `Result` containing `true` if the object is update-locked, `false` otherwise, or an [`Error`].
     pub async fn is_update_locked(&self, notarized_object_id: ObjectID) -> Result<bool, Error> {
-        let tx = NotarizationImpl::is_update_locked(self.notarization_pkg_id, notarized_object_id, self).await?;
+        let tx = NotarizationImpl::is_update_locked(notarized_object_id, self).await?;
 
         self.execute_read_only_transaction(tx).await
     }
@@ -351,7 +351,7 @@ impl NotarizationClientReadOnly {
     /// # Returns
     /// A `Result` containing `true` if the object is destroy-allowed, `false` otherwise, or an [`Error`].
     pub async fn is_destroy_allowed(&self, notarized_object_id: ObjectID) -> Result<bool, Error> {
-        let tx = NotarizationImpl::is_destroy_allowed(self.notarization_pkg_id, notarized_object_id, self).await?;
+        let tx = NotarizationImpl::is_destroy_allowed(notarized_object_id, self).await?;
 
         self.execute_read_only_transaction(tx).await
     }
@@ -365,7 +365,7 @@ impl NotarizationClientReadOnly {
     /// # Returns
     /// A `Result` containing `true` if the object is transfer-locked, `false` otherwise, or an [`Error`].
     pub async fn is_transfer_locked(&self, notarized_object_id: ObjectID) -> Result<bool, Error> {
-        let tx = NotarizationImpl::is_transfer_locked(self.notarization_pkg_id, notarized_object_id, self).await?;
+        let tx = NotarizationImpl::is_transfer_locked(notarized_object_id, self).await?;
 
         self.execute_read_only_transaction(tx).await
     }

notarization-rs/src/core/destroy.rs

@@ -12,18 +12,17 @@ use tokio::sync::OnceCell;
 
 use super::operations::{NotarizationImpl, NotarizationOperations};
 use crate::error::Error;
-use crate::package::notarization_package_id;
 
 /// A transaction that destroys a notarization
 pub struct DestroyNotarization {
-    notarized_object_id: ObjectID,
+    notarization_id: ObjectID,
     cached_ptb: OnceCell<ProgrammableTransaction>,
 }
 
 impl DestroyNotarization {
-    pub fn new(object_id: ObjectID) -> Self {
+    pub fn new(notarization_id: ObjectID) -> Self {
         Self {
-            notarized_object_id: object_id,
+            notarization_id,
             cached_ptb: OnceCell::new(),
         }
     }
@@ -32,9 +31,7 @@ impl DestroyNotarization {
     where
         C: CoreClientReadOnly + OptionalSync,
     {
-        let package_id = notarization_package_id(client).await?;
-
-        NotarizationImpl::destroy(client, package_id, self.notarized_object_id).await
+        NotarizationImpl::destroy(client, self.notarization_id).await
     }
 }
 

notarization-rs/src/core/metadata.rs

@@ -14,7 +14,6 @@ use tokio::sync::OnceCell;
 use super::operations::{NotarizationImpl, NotarizationOperations};
 use super::timelock::LockMetadata;
 use crate::error::Error;
-use crate::package::notarization_package_id;
 
 /// The immutable metadata of a notarization.
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
@@ -29,15 +28,16 @@ pub struct ImmutableMetadata {
 
 pub struct UpdateMetadata {
     metadata: Option<String>,
-    object_id: ObjectID,
+    /// The ID of the notarization to update
+    notarization_id: ObjectID,
     cached_ptb: OnceCell<ProgrammableTransaction>,
 }
 
 impl UpdateMetadata {
-    pub fn new(metadata: Option<String>, object_id: ObjectID) -> Self {
+    pub fn new(metadata: Option<String>, notarization_id: ObjectID) -> Self {
         Self {
             metadata,
-            object_id,
+            notarization_id,
             cached_ptb: OnceCell::new(),
         }
     }
@@ -46,9 +46,7 @@ impl UpdateMetadata {
     where
         C: CoreClientReadOnly + OptionalSync,
     {
-        let package_id = notarization_package_id(client).await?;
-
-        NotarizationImpl::update_metadata(client, package_id, self.object_id, self.metadata.clone()).await
+        NotarizationImpl::update_metadata(client, self.notarization_id, self.metadata.clone()).await
     }
 }