issue public-awesome#141, fix linter: to_binary > to_json_binary, fro…

…m_binary > from_json

contracts/cw2981-royalties/src/lib.rs

@@ -5,7 +5,7 @@ pub mod query;
 pub use query::{check_royalties, query_royalties_info};
 
 use cosmwasm_schema::cw_serde;
-use cosmwasm_std::{to_binary, Empty};
+use cosmwasm_std::{to_json_binary, Empty};
 use cw721_base::Cw721Contract;
 pub use cw721_base::{InstantiateMsg, MinterResponse};
 
@@ -107,8 +107,8 @@ pub mod entry {
                 Cw2981QueryMsg::RoyaltyInfo {
                     token_id,
                     sale_price,
-                } => to_binary(&query_royalties_info(deps, token_id, sale_price)?),
-                Cw2981QueryMsg::CheckRoyalties {} => to_binary(&check_royalties(deps)?),
+                } => to_json_binary(&query_royalties_info(deps, token_id, sale_price)?),
+                Cw2981QueryMsg::CheckRoyalties {} => to_json_binary(&check_royalties(deps)?),
             },
             _ => Cw2981Contract::default().query(deps, env, msg),
         }
@@ -120,7 +120,7 @@ mod tests {
     use super::*;
     use crate::msg::{CheckRoyaltiesResponse, RoyaltiesInfoResponse};
 
-    use cosmwasm_std::{from_binary, Uint128};
+    use cosmwasm_std::{from_json, Uint128};
 
     use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
     use cw721::Cw721Query;
@@ -227,7 +227,7 @@ mod tests {
             msg: Cw2981QueryMsg::CheckRoyalties {},
         };
         let query_res: CheckRoyaltiesResponse =
-            from_binary(&entry::query(deps.as_ref(), mock_env(), query_msg).unwrap()).unwrap();
+            from_json(&entry::query(deps.as_ref(), mock_env(), query_msg).unwrap()).unwrap();
         assert_eq!(query_res, expected);
     }
 
@@ -275,7 +275,7 @@ mod tests {
             },
         };
         let query_res: RoyaltiesInfoResponse =
-            from_binary(&entry::query(deps.as_ref(), mock_env(), query_msg).unwrap()).unwrap();
+            from_json(&entry::query(deps.as_ref(), mock_env(), query_msg).unwrap()).unwrap();
         assert_eq!(query_res, expected);
 
         // check for rounding down

contracts/cw721-base/src/contract_tests.rs

@@ -2,7 +2,7 @@
 use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
 
 use cosmwasm_std::{
-    from_binary, to_binary, Addr, CosmosMsg, DepsMut, Empty, Response, StdError, WasmMsg,
+    from_json, to_json_binary, Addr, CosmosMsg, DepsMut, Empty, Response, StdError, WasmMsg,
 };
 
 use cw721::{
@@ -185,7 +185,7 @@ fn test_update_minter() {
         .unwrap();
 
     // Minter does not change until ownership transfer completes.
-    let minter: MinterResponse = from_binary(
+    let minter: MinterResponse = from_json(
         &contract
             .query(deps.as_ref(), mock_env(), QueryMsg::Minter {})
             .unwrap(),
@@ -194,7 +194,7 @@ fn test_update_minter() {
     assert_eq!(minter.minter, Some(MINTER.to_string()));
 
     // Pending ownership transfer should be discoverable via query.
-    let ownership: cw_ownable::Ownership<Addr> = from_binary(
+    let ownership: cw_ownable::Ownership<Addr> = from_json(
         &contract
             .query(deps.as_ref(), mock_env(), QueryMsg::Ownership {})
             .unwrap(),
@@ -222,7 +222,7 @@ fn test_update_minter() {
         .unwrap();
 
     // Minter changes after ownership transfer is accepted.
-    let minter: MinterResponse = from_binary(
+    let minter: MinterResponse = from_json(
         &contract
             .query(deps.as_ref(), mock_env(), QueryMsg::Minter {})
             .unwrap(),
@@ -373,7 +373,7 @@ fn sending_nft() {
         .execute(deps.as_mut(), mock_env(), minter, mint_msg)
         .unwrap();
 
-    let msg = to_binary("You now have the melting power").unwrap();
+    let msg = to_json_binary("You now have the melting power").unwrap();
     let target = String::from("another_contract");
     let send_msg = ExecuteMsg::SendNft {
         contract: target.clone(),
@@ -513,7 +513,7 @@ fn approving_revoking() {
         token_id: token_id.clone(),
         include_expired: None,
     };
-    let res: OwnerOfResponse = from_binary(
+    let res: OwnerOfResponse = from_json(
         &contract
             .query(deps.as_ref(), mock_env(), query_msg.clone())
             .unwrap(),
@@ -547,7 +547,7 @@ fn approving_revoking() {
         .unwrap();
 
     // Approvals are now removed / cleared
-    let res: OwnerOfResponse = from_binary(
+    let res: OwnerOfResponse = from_json(
         &contract
             .query(deps.as_ref(), mock_env(), query_msg)
             .unwrap(),
@@ -637,15 +637,15 @@ fn approving_all_revoking_all() {
     // random can now send
     let inner_msg = WasmMsg::Execute {
         contract_addr: "another_contract".into(),
-        msg: to_binary("You now also have the growing power").unwrap(),
+        msg: to_json_binary("You now also have the growing power").unwrap(),
         funds: vec![],
     };
     let msg: CosmosMsg = CosmosMsg::Wasm(inner_msg);
 
     let send_msg = ExecuteMsg::SendNft {
         contract: String::from("another_contract"),
         token_id: token_id2,
-        msg: to_binary(&msg).unwrap(),
+        msg: to_json_binary(&msg).unwrap(),
     };
     contract
         .execute(deps.as_mut(), mock_env(), random, send_msg)

contracts/cw721-base/src/helpers.rs

@@ -2,7 +2,7 @@ use std::marker::PhantomData;
 
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{
-    to_binary, Addr, CosmosMsg, CustomMsg, QuerierWrapper, StdResult, WasmMsg, WasmQuery,
+    to_json_binary, Addr, CosmosMsg, CustomMsg, QuerierWrapper, StdResult, WasmMsg, WasmQuery,
 };
 use cw721::{
     AllNftInfoResponse, Approval, ApprovalResponse, ApprovalsResponse, ContractInfoResponse,
@@ -27,7 +27,7 @@ impl<Q: CustomMsg, E: CustomMsg> Cw721Contract<Q, E> {
     }
 
     pub fn call<T: Serialize>(&self, msg: ExecuteMsg<T, E>) -> StdResult<CosmosMsg> {
-        let msg = to_binary(&msg)?;
+        let msg = to_json_binary(&msg)?;
         Ok(WasmMsg::Execute {
             contract_addr: self.addr().into(),
             msg,
@@ -43,7 +43,7 @@ impl<Q: CustomMsg, E: CustomMsg> Cw721Contract<Q, E> {
     ) -> StdResult<T> {
         let query = WasmQuery::Smart {
             contract_addr: self.addr().into(),
-            msg: to_binary(&req)?,
+            msg: to_json_binary(&req)?,
         }
         .into();
         querier.query(&query)

contracts/cw721-base/src/multi_tests.rs

@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_binary, Addr, Empty, QuerierWrapper, WasmMsg};
+use cosmwasm_std::{to_json_binary, Addr, Empty, QuerierWrapper, WasmMsg};
 use cw721::OwnerOfResponse;
 use cw_multi_test::{App, Contract, ContractWrapper, Executor};
 
@@ -110,7 +110,7 @@ fn test_016_017_migration() {
         WasmMsg::Migrate {
             contract_addr: cw721.to_string(),
             new_code_id: code_id_017,
-            msg: to_binary(&Empty::default()).unwrap(),
+            msg: to_json_binary(&Empty::default()).unwrap(),
         }
         .into(),
     )

contracts/cw721-base/src/query.rs

@@ -2,7 +2,7 @@ use serde::de::DeserializeOwned;
 use serde::Serialize;
 
 use cosmwasm_std::{
-    to_binary, Addr, Binary, BlockInfo, CustomMsg, Deps, Env, Order, StdError, StdResult,
+    to_json_binary, Addr, Binary, BlockInfo, CustomMsg, Deps, Env, Order, StdError, StdResult,
 };
 
 use cw721::{
@@ -250,19 +250,19 @@ where
 {
     pub fn query(&self, deps: Deps, env: Env, msg: QueryMsg<Q>) -> StdResult<Binary> {
         match msg {
-            QueryMsg::Minter {} => to_binary(&self.minter(deps)?),
-            QueryMsg::ContractInfo {} => to_binary(&self.contract_info(deps)?),
-            QueryMsg::NftInfo { token_id } => to_binary(&self.nft_info(deps, token_id)?),
+            QueryMsg::Minter {} => to_json_binary(&self.minter(deps)?),
+            QueryMsg::ContractInfo {} => to_json_binary(&self.contract_info(deps)?),
+            QueryMsg::NftInfo { token_id } => to_json_binary(&self.nft_info(deps, token_id)?),
             QueryMsg::OwnerOf {
                 token_id,
                 include_expired,
             } => {
-                to_binary(&self.owner_of(deps, env, token_id, include_expired.unwrap_or(false))?)
+                to_json_binary(&self.owner_of(deps, env, token_id, include_expired.unwrap_or(false))?)
             }
             QueryMsg::AllNftInfo {
                 token_id,
                 include_expired,
-            } => to_binary(&self.all_nft_info(
+            } => to_json_binary(&self.all_nft_info(
                 deps,
                 env,
                 token_id,
@@ -272,7 +272,7 @@ where
                 owner,
                 operator,
                 include_expired,
-            } => to_binary(&self.operator(
+            } => to_json_binary(&self.operator(
                 deps,
                 env,
                 owner,
@@ -284,28 +284,28 @@ where
                 include_expired,
                 start_after,
                 limit,
-            } => to_binary(&self.operators(
+            } => to_json_binary(&self.operators(
                 deps,
                 env,
                 owner,
                 include_expired.unwrap_or(false),
                 start_after,
                 limit,
             )?),
-            QueryMsg::NumTokens {} => to_binary(&self.num_tokens(deps)?),
+            QueryMsg::NumTokens {} => to_json_binary(&self.num_tokens(deps)?),
             QueryMsg::Tokens {
                 owner,
                 start_after,
                 limit,
-            } => to_binary(&self.tokens(deps, owner, start_after, limit)?),
+            } => to_json_binary(&self.tokens(deps, owner, start_after, limit)?),
             QueryMsg::AllTokens { start_after, limit } => {
-                to_binary(&self.all_tokens(deps, start_after, limit)?)
+                to_json_binary(&self.all_tokens(deps, start_after, limit)?)
             }
             QueryMsg::Approval {
                 token_id,
                 spender,
                 include_expired,
-            } => to_binary(&self.approval(
+            } => to_json_binary(&self.approval(
                 deps,
                 env,
                 token_id,
@@ -316,9 +316,9 @@ where
                 token_id,
                 include_expired,
             } => {
-                to_binary(&self.approvals(deps, env, token_id, include_expired.unwrap_or(false))?)
+                to_json_binary(&self.approvals(deps, env, token_id, include_expired.unwrap_or(false))?)
             }
-            QueryMsg::Ownership {} => to_binary(&Self::ownership(deps)?),
+            QueryMsg::Ownership {} => to_json_binary(&Self::ownership(deps)?),
             QueryMsg::Extension { msg: _ } => Ok(Binary::default()),
         }
     }

contracts/cw721-expiration/src/contract_tests.rs

@@ -3,7 +3,7 @@ use std::env;
 
 use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
 
-use cosmwasm_std::{from_binary, to_binary, Addr, CosmosMsg, DepsMut, Response, StdError, WasmMsg};
+use cosmwasm_std::{from_json, to_json_binary, Addr, CosmosMsg, DepsMut, Response, StdError, WasmMsg};
 
 use cw721::{
     Approval, ApprovalResponse, ContractInfoResponse, Cw721ReceiveMsg, Expiration, NftInfoResponse,
@@ -206,7 +206,7 @@ fn test_update_minter() {
         .unwrap();
 
     // Minter does not change until ownership transfer completes.
-    let minter: MinterResponse = from_binary(
+    let minter: MinterResponse = from_json(
         &contract
             .query(deps.as_ref(), mock_env(), QueryMsg::Minter {})
             .unwrap(),
@@ -215,7 +215,7 @@ fn test_update_minter() {
     assert_eq!(minter.minter, Some(MINTER.to_string()));
 
     // Pending ownership transfer should be discoverable via query.
-    let ownership: cw_ownable::Ownership<Addr> = from_binary(
+    let ownership: cw_ownable::Ownership<Addr> = from_json(
         &contract
             .query(deps.as_ref(), mock_env(), QueryMsg::Ownership {})
             .unwrap(),
@@ -243,7 +243,7 @@ fn test_update_minter() {
         .unwrap();
 
     // Minter changes after ownership transfer is accepted.
-    let minter: MinterResponse = from_binary(
+    let minter: MinterResponse = from_json(
         &contract
             .query(deps.as_ref(), mock_env(), QueryMsg::Minter {})
             .unwrap(),
@@ -454,7 +454,7 @@ fn test_send_nft() {
         .execute(deps.as_mut(), env.clone(), minter, mint_msg)
         .unwrap();
 
-    let msg = to_binary("You now have the melting power").unwrap();
+    let msg = to_json_binary("You now have the melting power").unwrap();
     let target = String::from("another_contract");
     let send_msg = ExecuteMsg::SendNft {
         contract: target.clone(),
@@ -617,7 +617,7 @@ fn test_approve_revoke() {
         include_expired: None,
         include_invalid: None,
     };
-    let res: OwnerOfResponse = from_binary(
+    let res: OwnerOfResponse = from_json(
         &contract
             .query(deps.as_ref(), env.clone(), query_msg.clone())
             .unwrap(),
@@ -661,7 +661,7 @@ fn test_approve_revoke() {
         .unwrap();
 
     // Approvals are now removed / cleared
-    let res: OwnerOfResponse = from_binary(
+    let res: OwnerOfResponse = from_json(
         &contract
             .query(deps.as_ref(), env.clone(), query_msg)
             .unwrap(),
@@ -793,15 +793,15 @@ fn test_approve_all_revoke_all() {
     // random can now send
     let inner_msg = WasmMsg::Execute {
         contract_addr: "another_contract".into(),
-        msg: to_binary("You now also have the growing power").unwrap(),
+        msg: to_json_binary("You now also have the growing power").unwrap(),
         funds: vec![],
     };
     let msg: CosmosMsg = CosmosMsg::Wasm(inner_msg);
 
     let send_msg = ExecuteMsg::SendNft {
         contract: String::from("another_contract"),
         token_id: token_id2,
-        msg: to_binary(&msg).unwrap(),
+        msg: to_json_binary(&msg).unwrap(),
     };
     contract
         .execute(deps.as_mut(), mock_env(), random, send_msg)