feat(storage): return error when storing already stored object

axone-protocol · Mar 3, 2023 · da89b6f · da89b6f
1 parent 803e1b3
commit da89b6f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/contracts/cw-storage/src/contract.rs b/contracts/cw-storage/src/contract.rs
@@ -93,8 +93,7 @@ pub mod execute {
 
         let data_path = DATA.key(object.id.clone());
         if data_path.has(deps.storage) {
-            // TODO: maybe throw an error if the owner is different? Or if object already exists?
-            return Ok(res);
+            return Err(ContractError::Bucket(BucketError::ObjectAlreadyStored));
         }
 
         data_path.save(deps.storage, &data.0)?;
@@ -316,19 +315,6 @@ mod tests {
         let bucket = BUCKET.load(&deps.storage).unwrap();
         assert_eq!(bucket.size.u128(), obj1.3 + obj2.3);
         assert_eq!(bucket.object_count.u128(), 2);
-
-        let msg = ExecuteMsg::StoreObject {
-            data: Binary::from_base64(obj1.0.as_str()).unwrap(),
-            pin: obj1.1,
-        };
-        let res = execute(deps.as_mut(), mock_env(), info, msg).unwrap();
-        assert_eq!(
-            res.attributes,
-            vec![
-                Attribute::new("action", "store_object"),
-                Attribute::new("id", obj1.2),
-            ]
-        );
         assert_eq!(
             objects()
                 .keys_raw(&deps.storage, None, None, Order::Ascending)
@@ -343,6 +329,28 @@ mod tests {
         );
     }
 
+    #[test]
+    fn store_object_already_stored() {
+        let mut deps = mock_dependencies();
+        let info = mock_info("creator", &[]);
+        let msg = InstantiateMsg {
+            bucket: String::from("test"),
+            limits: BucketLimits::new(),
+        };
+        instantiate(deps.as_mut(), mock_env(), info.clone(), msg).unwrap();
+
+        let object = general_purpose::STANDARD.encode("already existing object");
+        let msg = ExecuteMsg::StoreObject {
+            data: Binary::from_base64(object.as_str()).unwrap(),
+            pin: true,
+        };
+        execute(deps.as_mut(), mock_env(), info.clone(), msg.clone()).unwrap();
+        assert_eq!(
+            execute(deps.as_mut(), mock_env(), info, msg).err(),
+            Some(ContractError::Bucket(BucketError::ObjectAlreadyStored)),
+        );
+    }
+
     #[test]
     fn store_object_limits() {
         let cases = vec![

diff --git a/contracts/cw-storage/src/error.rs b/contracts/cw-storage/src/error.rs
@@ -29,4 +29,7 @@ pub enum BucketError {
 
     #[error("Maximum object pins number exceeded")]
     MaxObjectPinsLimitExceeded,
+
+    #[error("Object is already stored")]
+    ObjectAlreadyStored,
 }
diff --git a/contracts/cw-storage/src/msg.rs b/contracts/cw-storage/src/msg.rs
@@ -26,7 +26,7 @@ pub enum ExecuteMsg {
     /// # StoreObject
     /// StoreObject store an object to the bucket and make the sender the owner of the object.
     /// The object is referenced by the hash of its content and this value is returned.
-    /// If the object is already stored, this is a no-op.
+    /// If the object is already stored, an error is returned.
     /// If pin is true, the object is pinned for the sender.
     StoreObject { data: Binary, pin: bool },