rename CW721_ADMIN > ADMIN_USED_FOR_CW721

public-awesome · Jan 22, 2024 · b5c4acb · b5c4acb
1 parent 5016c3a
commit b5c4acb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/packages/ics721/src/execute.rs b/packages/ics721/src/execute.rs
@@ -19,8 +19,8 @@ use crate::{
     },
     msg::{CallbackMsg, ExecuteMsg, InstantiateMsg, MigrateMsg},
     state::{
-        CollectionData, UniversalAllNftInfoResponse, CLASS_ID_TO_CLASS, CLASS_ID_TO_NFT_CONTRACT,
-        CW721_ADMIN, CW721_CODE_ID, INCOMING_PROXY, NFT_CONTRACT_TO_CLASS_ID,
+        CollectionData, UniversalAllNftInfoResponse, ADMIN_USED_FOR_CW721, CLASS_ID_TO_CLASS,
+        CLASS_ID_TO_NFT_CONTRACT, CW721_CODE_ID, INCOMING_PROXY, NFT_CONTRACT_TO_CLASS_ID,
         OUTGOING_CLASS_TOKEN_TO_CHANNEL, OUTGOING_PROXY, PO, TOKEN_METADATA,
     },
     token_types::{VoucherCreation, VoucherRedemption},
@@ -62,7 +62,7 @@ where
             ));
         }
 
-        CW721_ADMIN.save(
+        ADMIN_USED_FOR_CW721.save(
             deps.storage,
             &msg.cw721_admin
                 .as_ref()
@@ -336,7 +336,9 @@ where
             CLASS_ID_TO_NFT_CONTRACT.save(deps.storage, class_id.clone(), &cw721_addr)?;
             NFT_CONTRACT_TO_CLASS_ID.save(deps.storage, cw721_addr, &class_id)?;
 
-            let admin = CW721_ADMIN.load(deps.storage)?.map(|a| a.to_string());
+            let admin = ADMIN_USED_FOR_CW721
+                .load(deps.storage)?
+                .map(|a| a.to_string());
             let message = SubMsg::<T>::reply_on_success(
                 WasmMsg::Instantiate2 {
                     admin,
@@ -509,9 +511,9 @@ where
                 }
                 if let Some(cw721_admin) = cw721_admin.clone() {
                     if cw721_admin.is_empty() {
-                        CW721_ADMIN.save(deps.storage, &None)?;
+                        ADMIN_USED_FOR_CW721.save(deps.storage, &None)?;
                     } else {
-                        CW721_ADMIN
+                        ADMIN_USED_FOR_CW721
                             .save(deps.storage, &Some(deps.api.addr_validate(&cw721_admin)?))?;
                     }
                 }

diff --git a/packages/ics721/src/query.rs b/packages/ics721/src/query.rs
@@ -4,9 +4,10 @@ use cw_storage_plus::Map;
 use crate::{
     msg::QueryMsg,
     state::{
-        UniversalAllNftInfoResponse, CLASS_ID_TO_CLASS, CLASS_ID_TO_NFT_CONTRACT, CW721_ADMIN,
-        CW721_CODE_ID, INCOMING_CLASS_TOKEN_TO_CHANNEL, INCOMING_PROXY, NFT_CONTRACT_TO_CLASS_ID,
-        OUTGOING_CLASS_TOKEN_TO_CHANNEL, OUTGOING_PROXY, PO, TOKEN_METADATA,
+        UniversalAllNftInfoResponse, ADMIN_USED_FOR_CW721, CLASS_ID_TO_CLASS,
+        CLASS_ID_TO_NFT_CONTRACT, CW721_CODE_ID, INCOMING_CLASS_TOKEN_TO_CHANNEL, INCOMING_PROXY,
+        NFT_CONTRACT_TO_CLASS_ID, OUTGOING_CLASS_TOKEN_TO_CHANNEL, OUTGOING_PROXY, PO,
+        TOKEN_METADATA,
     },
 };
 use ics721_types::token_types::{Class, ClassId, ClassToken, Token, TokenId};
@@ -34,7 +35,7 @@ pub trait Ics721Query {
             QueryMsg::OutgoingProxy {} => to_json_binary(&OUTGOING_PROXY.load(deps.storage)?),
             QueryMsg::IncomingProxy {} => to_json_binary(&INCOMING_PROXY.load(deps.storage)?),
             QueryMsg::Cw721CodeId {} => to_json_binary(&self.query_cw721_code_id(deps)?),
-            QueryMsg::Cw721Admin {} => to_json_binary(&CW721_ADMIN.load(deps.storage)?),
+            QueryMsg::Cw721Admin {} => to_json_binary(&ADMIN_USED_FOR_CW721.load(deps.storage)?),
             QueryMsg::NftContracts { start_after, limit } => {
                 to_json_binary(&self.query_nft_contracts(deps, start_after, limit)?)
             }

diff --git a/packages/ics721/src/state.rs b/packages/ics721/src/state.rs
@@ -39,7 +39,7 @@ pub const INCOMING_CLASS_TOKEN_TO_CHANNEL: Map<(ClassId, TokenId), String> = Map
 /// it's source chain, the metadata is removed from the map.
 pub const TOKEN_METADATA: Map<(ClassId, TokenId), Option<Binary>> = Map::new("j");
 /// The admin address for instantiating new cw721 contracts. In case of None, contract is immutable.
-pub const CW721_ADMIN: Item<Option<Addr>> = Item::new("l");
+pub const ADMIN_USED_FOR_CW721: Item<Option<Addr>> = Item::new("l");
 
 #[derive(Deserialize)]
 pub struct UniversalAllNftInfoResponse {

diff --git a/packages/ics721/src/testing/contract.rs b/packages/ics721/src/testing/contract.rs
@@ -16,7 +16,7 @@ use crate::{
     msg::InstantiateMsg,
     query::Ics721Query,
     state::{
-        CollectionData, CLASS_ID_TO_CLASS, CW721_ADMIN, CW721_CODE_ID, INCOMING_PROXY,
+        CollectionData, ADMIN_USED_FOR_CW721, CLASS_ID_TO_CLASS, CW721_CODE_ID, INCOMING_PROXY,
         OUTGOING_CLASS_TOKEN_TO_CHANNEL, OUTGOING_PROXY, PO,
     },
     utils::get_collection_data,
@@ -545,7 +545,7 @@ fn test_instantiate() {
     );
     assert!(!PO.paused.load(&deps.storage).unwrap());
     assert_eq!(
-        CW721_ADMIN.load(&deps.storage).unwrap(),
+        ADMIN_USED_FOR_CW721.load(&deps.storage).unwrap(),
         Some(Addr::unchecked(ADMIN_ADDR.to_string()))
     );
 }