Some PR cleanup

CosmWasm · Sep 28, 2020 · 45f8b8b · 45f8b8b
1 parent b6f9ab8
commit 45f8b8b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/contracts/cw721-base/schema/tokens_response.json b/contracts/cw721-base/schema/tokens_response.json
@@ -7,7 +7,7 @@
   ],
   "properties": {
     "tokens": {
-      "description": "Contains all token_ids in lexographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
+      "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
       "type": "array",
       "items": {
         "type": "string"

diff --git a/contracts/cw721-base/src/contract.rs b/contracts/cw721-base/src/contract.rs
@@ -94,7 +94,10 @@ pub fn handle_mint<S: Storage, A: Api, Q: Querier>(
         description: description.unwrap_or_default(),
         image,
     };
-    tokens(&mut deps.storage).save(token_id.as_bytes(), &token)?;
+    tokens(&mut deps.storage).update(token_id.as_bytes(), |old| match old {
+        Some(_) => Err(StdError::generic_err("token_id already claimed")),
+        None => Ok(token),
+    })?;
 
     increment_tokens(&mut deps.storage)?;
 

diff --git a/packages/cw721/schema/tokens_response.json b/packages/cw721/schema/tokens_response.json
@@ -7,7 +7,7 @@
   ],
   "properties": {
     "tokens": {
-      "description": "Contains all token_ids in lexographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
+      "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
       "type": "array",
       "items": {
         "type": "string"

diff --git a/packages/cw721/src/query.rs b/packages/cw721/src/query.rs
@@ -100,7 +100,7 @@ pub struct AllNftInfoResponse {
 
 #[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
 pub struct TokensResponse {
-    /// Contains all token_ids in lexographical ordering
+    /// Contains all token_ids in lexicographical ordering
     /// If there are more than `limit`, use `start_from` in future queries
     /// to achieve pagination.
     pub tokens: Vec<String>,