feat(storage): load buckect only if object exist

axone-protocol · Mar 9, 2023 · 57327db · 57327db
1 parent 4bb1af0
commit 57327db
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/contracts/cw-storage/src/contract.rs b/contracts/cw-storage/src/contract.rs
@@ -126,14 +126,14 @@ pub mod execute {
         info: MessageInfo,
         object_id: ObjectId,
     ) -> Result<Response, ContractError> {
+        let res = Response::new()
+            .add_attribute("action", "pin_object")
+            .add_attribute("id", object_id.clone());
+
         if pins().has(deps.storage, (object_id.clone(), info.sender.clone())) {
-            return Ok(Response::new()
-                .add_attribute("action", "pin_object")
-                .add_attribute("id", object_id));
+            return Ok(res);
         }
 
-        let bucket = BUCKET.load(deps.storage)?;
-
         let o = objects().update(
             deps.storage,
             object_id.clone(),
@@ -146,6 +146,8 @@ pub mod execute {
             },
         )?;
 
+        let bucket = BUCKET.load(deps.storage)?;
+
         match bucket.limits {
             Limits {
                 max_object_pins: Some(max),
@@ -158,13 +160,11 @@ pub mod execute {
                     deps.storage,
                     (object_id.clone(), info.sender.clone()),
                     &Pin {
-                        id: object_id.clone(),
+                        id: object_id,
                         address: info.sender,
                     },
                 )?;
-                Ok(Response::new()
-                    .add_attribute("action", "pin_object")
-                    .add_attribute("id", object_id))
+                Ok(res)
             }
         }
     }