chore: simplified method macro logic to use Interface::root method (#913

)
calimero-network · Oct 31, 2024 · 70222f4 · 70222f4
1 parent 25697e0
commit 70222f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/crates/sdk/macros/src/logic/method.rs b/crates/sdk/macros/src/logic/method.rs
@@ -99,9 +99,8 @@ impl ToTokens for PublicLogicMethod<'_> {
                         SelfType::Owned(_) | SelfType::Immutable(_) => None,
                     };
                     quote! {
-                        let Some(#mutability app) = ::calimero_storage::interface::Interface::find_by_id::<#self_>(
-                            ::calimero_storage::address::Id::root()
-                        ).ok().flatten() else {
+                        let Some(#mutability app) = ::calimero_storage::interface::Interface::root::<#self_>().ok().flatten()
+                        else {
                             ::calimero_sdk::env::panic_str("Failed to find or read app state")
                         };
                     }
@@ -111,9 +110,7 @@ impl ToTokens for PublicLogicMethod<'_> {
             None => (
                 if init_method {
                     quote! {
-                        if let Some(mut app) = ::calimero_storage::interface::Interface::find_by_id::<#self_>(
-                            ::calimero_storage::address::Id::root()
-                        ).ok().flatten() {
+                        if let Some(mut app) = ::calimero_storage::interface::Interface::root::<#self_>().ok().flatten() {
                             ::calimero_sdk::env::panic_str("Cannot initialize over already existing state.")
                         };
 

diff --git a/crates/storage/src/address.rs b/crates/storage/src/address.rs
@@ -72,7 +72,7 @@ impl Id {
         Self { bytes }
     }
 
-    /// Root ID which is set to all zeroes by default.
+    /// Root ID which is set to the context ID.
     #[must_use]
     pub fn root() -> Self {
         Id::new(context_id())