ignore lint

public-awesome · Mar 27, 2024 · 721e86a · 721e86a
1 parent b55a074
commit 721e86a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 23 deletions.
diff --git a/contracts/whitelist-updatable-flatrate/src/contract.rs b/contracts/whitelist-updatable-flatrate/src/contract.rs
@@ -2,7 +2,7 @@ use crate::state::{Config, CONFIG, TOTAL_ADDRESS_COUNT, WHITELIST};
 #[cfg(not(feature = "library"))]
 use cosmwasm_std::entry_point;
 use cosmwasm_std::{
-    ensure, to_binary, Addr, Binary, Deps, DepsMut, Empty, Env, Event, MessageInfo, Order,
+    ensure, to_json_binary, Addr, Binary, Deps, DepsMut, Empty, Env, Event, MessageInfo, Order,
     StdError, StdResult,
 };
 use cw2::set_contract_version;
@@ -271,14 +271,18 @@ pub fn execute_purge(deps: DepsMut, info: MessageInfo) -> Result<Response, Contr
 #[cfg_attr(not(feature = "library"), entry_point)]
 pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
     match msg {
-        QueryMsg::Config {} => to_binary(&query_config(deps)?),
-        QueryMsg::IncludesAddress { address } => to_binary(&query_includes_address(deps, address)?),
-        QueryMsg::MintCount { address } => to_binary(&query_mint_count(deps, address)?),
-        QueryMsg::Admins {} => to_binary(&query_admins(deps)?),
-        QueryMsg::AddressCount {} => to_binary(&query_address_count(deps)?),
-        QueryMsg::PerAddressLimit {} => to_binary(&query_per_address_limit(deps)?),
-        QueryMsg::IsProcessable { address } => to_binary(&query_is_processable(deps, address)?),
-        QueryMsg::MintDiscountAmount {} => to_binary(&query_mint_discount_amount(deps)?),
+        QueryMsg::Config {} => to_json_binary(&query_config(deps)?),
+        QueryMsg::IncludesAddress { address } => {
+            to_json_binary(&query_includes_address(deps, address)?)
+        }
+        QueryMsg::MintCount { address } => to_json_binary(&query_mint_count(deps, address)?),
+        QueryMsg::Admins {} => to_json_binary(&query_admins(deps)?),
+        QueryMsg::AddressCount {} => to_json_binary(&query_address_count(deps)?),
+        QueryMsg::PerAddressLimit {} => to_json_binary(&query_per_address_limit(deps)?),
+        QueryMsg::IsProcessable { address } => {
+            to_json_binary(&query_is_processable(deps, address)?)
+        }
+        QueryMsg::MintDiscountAmount {} => to_json_binary(&query_mint_discount_amount(deps)?),
     }
 }
 

diff --git a/contracts/whitelist-updatable-flatrate/src/helpers.rs b/contracts/whitelist-updatable-flatrate/src/helpers.rs
@@ -1,6 +1,6 @@
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{
-    to_json_binary, Addr, QuerierWrapper, QueryRequest, StdResult, WasmMsg, WasmQuery,
+    to_binary, Addr, Decimal, QuerierWrapper, QueryRequest, StdResult, WasmMsg, WasmQuery,
 };
 use sg_std::CosmosMsg;
 
@@ -19,7 +19,7 @@ impl WhitelistUpdatableFlatrateContract {
     }
 
     pub fn call<T: Into<ExecuteMsg>>(&self, msg: T) -> StdResult<CosmosMsg> {
-        let msg = to_json_binary(&msg.into())?;
+        let msg = to_binary(&msg.into())?;
         Ok(WasmMsg::Execute {
             contract_addr: self.addr().into(),
             msg,
@@ -37,15 +37,15 @@ impl WhitelistUpdatableFlatrateContract {
     pub fn includes(&self, querier: &QuerierWrapper, address: String) -> StdResult<bool> {
         let includes: bool = querier.query(&QueryRequest::Wasm(WasmQuery::Smart {
             contract_addr: self.addr().into(),
-            msg: to_json_binary(&QueryMsg::IncludesAddress { address })?,
+            msg: to_binary(&QueryMsg::IncludesAddress { address })?,
         }))?;
         Ok(includes)
     }
 
     pub fn config(&self, querier: &QuerierWrapper) -> StdResult<Config> {
         let res: Config = querier.query(&QueryRequest::Wasm(WasmQuery::Smart {
             contract_addr: self.addr().into(),
-            msg: to_json_binary(&QueryMsg::Config {})?,
+            msg: to_binary(&QueryMsg::Config {})?,
         }))?;
 
         Ok(res)
@@ -54,7 +54,7 @@ impl WhitelistUpdatableFlatrateContract {
     pub fn mint_discount_amount(&self, querier: &QuerierWrapper) -> StdResult<Option<u64>> {
         querier.query(&QueryRequest::Wasm(WasmQuery::Smart {
             contract_addr: self.addr().into(),
-            msg: to_json_binary(&QueryMsg::MintDiscountAmount {})?,
+            msg: to_binary(&QueryMsg::MintDiscountAmount {})?,
         }))
     }
 }
diff --git a/contracts/whitelist-updatable/src/helpers.rs b/contracts/whitelist-updatable/src/helpers.rs
@@ -1,6 +1,7 @@
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{
-    to_binary, Addr, Decimal, QuerierWrapper, QueryRequest, StdResult, WasmMsg, WasmQuery,
+    to_json_binary, to_json_binary, Addr, Decimal, QuerierWrapper, QueryRequest, StdResult,
+    WasmMsg, WasmQuery,
 };
 use sg_std::CosmosMsg;
 
@@ -19,7 +20,7 @@ impl WhitelistUpdatableContract {
     }
 
     pub fn call<T: Into<ExecuteMsg>>(&self, msg: T) -> StdResult<CosmosMsg> {
-        let msg = to_binary(&msg.into())?;
+        let msg = to_json_binary(&msg.into())?;
         Ok(WasmMsg::Execute {
             contract_addr: self.addr().into(),
             msg,
@@ -37,15 +38,15 @@ impl WhitelistUpdatableContract {
     pub fn includes(&self, querier: &QuerierWrapper, address: String) -> StdResult<bool> {
         let includes: bool = querier.query(&QueryRequest::Wasm(WasmQuery::Smart {
             contract_addr: self.addr().into(),
-            msg: to_binary(&QueryMsg::IncludesAddress { address })?,
+            msg: to_json_binary(&QueryMsg::IncludesAddress { address })?,
         }))?;
         Ok(includes)
     }
 
     pub fn config(&self, querier: &QuerierWrapper) -> StdResult<Config> {
         let res: Config = querier.query(&QueryRequest::Wasm(WasmQuery::Smart {
             contract_addr: self.addr().into(),
-            msg: to_binary(&QueryMsg::Config {})?,
+            msg: to_json_binary(&QueryMsg::Config {})?,
         }))?;
 
         Ok(res)
@@ -54,7 +55,7 @@ impl WhitelistUpdatableContract {
     pub fn mint_discount_percent(&self, querier: &QuerierWrapper) -> StdResult<Option<Decimal>> {
         querier.query(&QueryRequest::Wasm(WasmQuery::Smart {
             contract_addr: self.addr().into(),
-            msg: to_binary(&QueryMsg::MintDiscountPercent {})?,
+            msg: to_json_binary(&QueryMsg::MintDiscountPercent {})?,
         }))
     }
 }
diff --git a/packages/sg-name/src/lib.rs b/packages/sg-name/src/lib.rs
@@ -1,5 +1,5 @@
 use cosmwasm_schema::{cw_serde, QueryResponses};
-use cosmwasm_std::{to_vec, Addr};
+use cosmwasm_std::{to_json_vec, Addr};
 
 pub const MAX_TEXT_LENGTH: u32 = 512;
 
@@ -13,7 +13,7 @@ pub struct NFT {
 
 impl NFT {
     pub fn into_json_string(self: &NFT) -> String {
-        String::from_utf8(to_vec(&self).unwrap_or_default()).unwrap_or_default()
+        String::from_utf8(to_json_vec(&self).unwrap_or_default()).unwrap_or_default()
     }
 }
 
@@ -34,7 +34,7 @@ impl TextRecord {
     }
 
     pub fn into_json_string(self: &TextRecord) -> String {
-        String::from_utf8(to_vec(&self).unwrap_or_default()).unwrap_or_default()
+        String::from_utf8(to_json_vec(&self).unwrap_or_default()).unwrap_or_default()
     }
 }
 
@@ -53,7 +53,7 @@ impl Metadata {
     // and represent it as a type. Note that we have to use the CosmWasm fork
     // of serde_json to avoid floats.
     pub fn into_json_string(self: &Metadata) -> String {
-        String::from_utf8(to_vec(&self).unwrap_or_default()).unwrap_or_default()
+        String::from_utf8(to_json_vec(&self).unwrap_or_default()).unwrap_or_default()
     }
 }