fix: lint issues

Author: ibrizsabin

contracts/cosmwasm-vm/cw-ibc-core/src/context.rs

@@ -1,4 +1,4 @@
-use cosmwasm_std::{from_slice, to_vec};
+use cosmwasm_std::{from_json as from_slice, to_json_vec as to_vec};
 use serde::{de::DeserializeOwned, Serialize};
 
 use super::*;

contracts/cosmwasm-vm/cw-ibc-core/src/contract.rs

@@ -2,7 +2,7 @@ use std::env;
 
 use super::*;
 
-use cosmwasm_std::to_binary;
+use cosmwasm_std::to_json_binary as to_binary;
 
 use cw_common::hex_string::HexString;
 use cw_common::query_helpers::build_smart_query;
@@ -714,7 +714,7 @@ mod tests {
     use super::{instantiate, query, InstantiateMsg, QueryMsg};
 
     use cosmwasm_std::{
-        from_binary,
+        from_json as from_binary,
         testing::{mock_dependencies, mock_env, mock_info, MockApi, MockQuerier, MockStorage},
         Addr, OwnedDeps,
     };

contracts/cosmwasm-vm/cw-ibc-core/src/ics02_client/handler.rs

@@ -550,14 +550,14 @@ impl<'a> IbcClient for CwIbcCoreContext<'a> {
 
 #[cfg(test)]
 mod tests {
-    use cosmwasm_std::{from_binary, to_binary};
+    use cosmwasm_std::{from_json, to_json_binary};
     use cw_common::client_response::CreateClientResponse;
     #[test]
     fn test_binary_conversion() {
         let res: CreateClientResponse = CreateClientResponse::default();
-        let bytes = to_binary(&res).unwrap();
+        let bytes = to_json_binary(&res).unwrap();
         println!("{}", hex::encode(bytes.0.clone()));
-        let decoded: CreateClientResponse = from_binary(&bytes).unwrap();
+        let decoded: CreateClientResponse = from_json(&bytes).unwrap();
         assert_eq!(res, decoded)
     }
 }

contracts/cosmwasm-vm/cw-ibc-core/src/ics02_client/mod.rs

@@ -10,8 +10,8 @@ use crate::{
 use common::ibc::core::ics24_host::identifier::ClientId;
 
 use cosmwasm_std::{
-    from_binary, to_binary, to_vec, Addr, CosmosMsg, DepsMut, Event, MessageInfo, Reply, Response,
-    Storage, SubMsg,
+    from_json as from_binary, to_json_binary as to_binary, to_json_vec as to_vec, Addr, CosmosMsg,
+    DepsMut, Event, MessageInfo, Reply, Response, Storage, SubMsg,
 };
 use cw_common::client_response::{
     MisbehaviourResponse, UpdateClientResponse, UpgradeClientResponse,

contracts/cosmwasm-vm/cw-ibc-core/src/ics03_connection/mod.rs

@@ -10,7 +10,7 @@ use cosmwasm_std::DepsMut;
 use cosmwasm_std::Event;
 use cosmwasm_std::Response;
 use cosmwasm_std::Storage;
-use cosmwasm_std::{to_vec, MessageInfo};
+use cosmwasm_std::{to_json_vec as to_vec, MessageInfo};
 use cw_common::client_msg::{
     VerifyClientConsensusState, VerifyClientFullState, VerifyConnectionState,
 };

contracts/cosmwasm-vm/cw-ibc-core/src/ics04_channel/handler/open_ack.rs

@@ -47,7 +47,6 @@ pub fn on_chan_open_ack_submessage(
     connection_id: &ConnectionId,
 ) -> Result<cosmwasm_std::IbcChannelConnectMsg, ContractError> {
     let port_id = port_id.clone();
-    let channel_id = channel_id;
     let counter_party_port_id = channel_end.counterparty().port_id.clone();
     let counter_party_channel = channel_end.counterparty().channel_id().unwrap().clone();
     let endpoint = cosmwasm_std::IbcEndpoint {

contracts/cosmwasm-vm/cw-ibc-core/src/ics04_channel/handler/open_init.rs

@@ -16,7 +16,6 @@ pub fn on_chan_open_init_submessage(
     channel_id: &ChannelId,
     connection_id: &ConnectionId,
 ) -> cosmwasm_std::IbcChannelOpenMsg {
-    let channel_id = channel_id;
     let counter_party_port_id = channel.remote.port_id();
     let counter_party_channel = channel
         .remote

contracts/cosmwasm-vm/cw-ibc-core/src/ics04_channel/handler/open_try.rs

@@ -62,7 +62,6 @@ pub fn on_chan_open_try_submessage(
     connection_id: &ConnectionId,
 ) -> cosmwasm_std::IbcChannelOpenMsg {
     let port_id = port_id.clone();
-    let channel_id = channel_id;
     let counter_party_port_id = msg.counterparty().port_id.clone();
     let counter_party_channel = msg.counterparty().channel_id().unwrap().clone();
     let endpoint = cosmwasm_std::IbcEndpoint {

contracts/cosmwasm-vm/cw-ibc-core/src/ics04_channel/mod.rs

@@ -18,7 +18,8 @@ use cosmwasm_std::Event;
 use cosmwasm_std::Reply;
 use cosmwasm_std::Storage;
 use cosmwasm_std::{
-    to_binary, to_vec, Binary, CosmosMsg, Empty, MessageInfo, Response, SubMsg, WasmMsg,
+    to_json_binary as to_binary, to_json_vec as to_vec, Binary, CosmosMsg, Empty, MessageInfo,
+    Response, SubMsg, WasmMsg,
 };
 pub use cw_common::client_msg::ExecuteMsg as LightClientMessage;
 use cw_common::commitment;

contracts/cosmwasm-vm/cw-ibc-core/src/light_client/light_client.rs

@@ -4,7 +4,7 @@ use common::consensus_state::IConsensusState;
 use common::icon::icon::lightclient::v1::{ClientState, ConsensusState};
 use common::traits::AnyTypes;
 use cosmwasm_schema::cw_serde;
-use cosmwasm_std::{to_binary, Binary, CosmosMsg, Deps, SubMsg};
+use cosmwasm_std::{to_json_binary as to_binary, Binary, CosmosMsg, Deps, SubMsg};
 use cw_common::client_msg::{LightClientPacketMessage, VerifyConnectionState};
 
 use cw_common::ibc_types::IbcClientId;

contracts/cosmwasm-vm/cw-icon-light-client/src/contract.rs

@@ -13,7 +13,8 @@ use common::icon::icon::types::v1::{MerkleProofs, SignedHeader};
 #[cfg(not(feature = "library"))]
 use cosmwasm_std::entry_point;
 use cosmwasm_std::{
-    to_binary, Binary, Deps, DepsMut, Env, MessageInfo, Response, StdError, StdResult,
+    to_json_binary as to_binary, Binary, Deps, DepsMut, Env, MessageInfo, Response, StdError,
+    StdResult,
 };
 use cw2::set_contract_version;
 use cw_common::client_response::{CreateClientResponse, UpdateClientResponse};
@@ -539,7 +540,7 @@ mod tests {
     use common::icon::icon::types::v1::{BtpHeader, SignedHeader};
     use cosmwasm_std::{
         testing::{mock_dependencies, mock_env, mock_info, MockApi, MockQuerier, MockStorage},
-        to_binary, Addr, OwnedDeps, Response,
+        to_json_binary as to_binary, Addr, OwnedDeps, Response,
     };
     use cw2::get_contract_version;
     use cw_common::{client_msg::QueryMsg, raw_types::Any};

contracts/cosmwasm-vm/cw-icon-light-client/src/light_client.rs

@@ -26,8 +26,8 @@ impl<'a> IconClient<'a> {
         &self,
         client_id: &str,
         header: &BtpHeader,
-        signatures: &Vec<Vec<u8>>,
-        validators: &Vec<Vec<u8>>,
+        signatures: &[Vec<u8>],
+        validators: &[Vec<u8>],
     ) -> Result<bool, ContractError> {
         let mut votes = u64::default();
         let state = self.context.get_client_state(client_id)?;

contracts/cosmwasm-vm/cw-mock-ibc-connection/src/lib.rs

@@ -16,8 +16,8 @@ use crate::{
 };
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{
-    entry_point, to_binary, Addr, Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response,
-    StdError, StdResult, Storage,
+    entry_point, to_json_binary as to_binary, Addr, Binary, Deps, DepsMut, Env, MessageInfo, Reply,
+    Response, StdError, StdResult, Storage,
 };
 use cw2::set_contract_version;
 

contracts/cosmwasm-vm/cw-mock-ibc-core/src/contract.rs

@@ -2,9 +2,9 @@ use common::ibc::core::ics04_channel::timeout::TimeoutHeight;
 #[cfg(not(feature = "library"))]
 use cosmwasm_std::entry_point;
 use cosmwasm_std::{
-    to_binary, Addr, Binary, CosmosMsg, Deps, DepsMut, Empty, Env, Event, IbcEndpoint, IbcPacket,
-    IbcPacketReceiveMsg, IbcTimeout, IbcTimeoutBlock, MessageInfo, Reply, Response, StdResult,
-    SubMsg, Timestamp, WasmMsg,
+    to_json_binary as to_binary, Addr, Binary, CosmosMsg, Deps, DepsMut, Empty, Env, Event,
+    IbcEndpoint, IbcPacket, IbcPacketReceiveMsg, IbcTimeout, IbcTimeoutBlock, MessageInfo, Reply,
+    Response, StdResult, SubMsg, Timestamp, WasmMsg,
 };
 use cw2::set_contract_version;
 use cw_common::hex_string::HexString;

contracts/cosmwasm-vm/cw-mock-ibc-core/src/helpers.rs

@@ -1,7 +1,7 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use cosmwasm_std::{to_binary, Addr, CosmosMsg, StdResult, WasmMsg};
+use cosmwasm_std::{to_json_binary as to_binary, Addr, CosmosMsg, StdResult, WasmMsg};
 
 use crate::msg::ExecuteMsg;
 

contracts/cosmwasm-vm/cw-mock-ibc-dapp/src/ibc_host.rs

@@ -1,6 +1,8 @@
 use crate::state::IbcConfig;
 use crate::types::LOG_PREFIX;
-use cosmwasm_std::{to_binary, CosmosMsg, Deps, DepsMut, MessageInfo, Storage, SubMsg, WasmMsg};
+use cosmwasm_std::{
+    to_json_binary as to_binary, CosmosMsg, Deps, DepsMut, MessageInfo, Storage, SubMsg, WasmMsg,
+};
 use cw_common::cw_types::CwPacket;
 use cw_common::query_helpers::build_smart_query;
 use cw_common::{hex_string::HexString, raw_types::channel::RawPacket, ProstMessage};
@@ -92,7 +94,7 @@ mod tests {
     use cosmwasm_std::{
         coin,
         testing::{mock_dependencies_with_balance, mock_env},
-        to_binary, Addr, CosmosMsg, MessageInfo, SubMsg, WasmMsg,
+        to_json_binary as to_binary, Addr, CosmosMsg, MessageInfo, SubMsg, WasmMsg,
     };
     use cw_common::{hex_string::HexString, raw_types::channel::RawPacket, ProstMessage};
 

contracts/cosmwasm-vm/cw-mock-ibc-dapp/src/lib.rs

@@ -22,8 +22,8 @@ use crate::{
 };
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{
-    entry_point, to_binary, Addr, Binary, Deps, DepsMut, Env, MessageInfo, Never, Reply, Response,
-    StdError, StdResult, Storage,
+    entry_point, to_json_binary as to_binary, Addr, Binary, Deps, DepsMut, Env, MessageInfo, Never,
+    Reply, Response, StdError, StdResult, Storage,
 };
 #[cfg(feature = "native_ibc")]
 use cw_common::cw_types::{CwTimeout, CwTimeoutBlock};

contracts/cosmwasm-vm/cw-xcall-ibc-connection/src/ack.rs

@@ -1,5 +1,5 @@
 use crate::error::ContractError;
-use cosmwasm_std::{attr, to_binary, Binary};
+use cosmwasm_std::{attr, to_json_binary as to_binary, Binary};
 use cw_common::cw_types::{CwBasicResponse, CwPacket};
 use cw_common::types::Ack;
 

contracts/cosmwasm-vm/cw-xcall-ibc-connection/src/ibc_host.rs

@@ -1,7 +1,9 @@
 use crate::state::IbcConfig;
 use crate::types::LOG_PREFIX;
 use common::ibc::Height;
-use cosmwasm_std::{to_binary, CosmosMsg, Deps, DepsMut, Storage, SubMsg, WasmMsg};
+use cosmwasm_std::{
+    to_json_binary as to_binary, CosmosMsg, Deps, DepsMut, Storage, SubMsg, WasmMsg,
+};
 use cw_common::cw_types::CwPacket;
 use cw_common::query_helpers::build_smart_query;
 use cw_common::raw_types::channel::RawChannel;
@@ -130,7 +132,7 @@ mod tests {
     use cosmwasm_std::{
         coin,
         testing::{mock_dependencies_with_balance, mock_env},
-        to_binary, Addr, CosmosMsg, SubMsg, WasmMsg,
+        to_json_binary as to_binary, Addr, CosmosMsg, SubMsg, WasmMsg,
     };
     use cw_common::{hex_string::HexString, raw_types::channel::RawPacket, ProstMessage};
 

contracts/cosmwasm-vm/cw-xcall-ibc-connection/src/lib.rs

@@ -26,8 +26,8 @@ use crate::{
 };
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{
-    entry_point, to_binary, Addr, Binary, Deps, DepsMut, Env, MessageInfo, Never, Reply, Response,
-    StdError, StdResult, Storage, SubMsg, SubMsgResult,
+    entry_point, to_json_binary as to_binary, Addr, Binary, Deps, DepsMut, Env, MessageInfo, Never,
+    Reply, Response, StdError, StdResult, Storage, SubMsg, SubMsgResult,
 };
 #[cfg(feature = "native_ibc")]
 use cw_common::cw_types::{CwTimeout, CwTimeoutBlock};

contracts/cosmwasm-vm/cw-xcall-ibc-connection/src/xcall.rs

@@ -1,4 +1,4 @@
-use cosmwasm_std::{to_binary, CosmosMsg, Empty, Storage, SubMsg, WasmMsg};
+use cosmwasm_std::{to_json_binary as to_binary, CosmosMsg, Empty, Storage, SubMsg, WasmMsg};
 use cw_xcall_lib::network_address::NetId;
 
 use crate::{

contracts/cosmwasm-vm/cw-xcall-ibc-connection/tests/setup.rs

@@ -7,9 +7,9 @@ use cosmwasm_std::{
         mock_dependencies, mock_env, mock_info, MockApi, MockQuerier, MockStorage,
         MOCK_CONTRACT_ADDR,
     },
-    to_binary, Addr, BlockInfo, ContractInfo, DepsMut, Empty, Env, Event, IbcChannel, IbcEndpoint,
-    IbcPacket, IbcTimeout, IbcTimeoutBlock, MessageInfo, OwnedDeps, Storage, SubMsgResponse,
-    Timestamp, TransactionInfo,
+    to_json_binary as to_binary, Addr, BlockInfo, ContractInfo, DepsMut, Empty, Env, Event,
+    IbcChannel, IbcEndpoint, IbcPacket, IbcTimeout, IbcTimeoutBlock, MessageInfo, OwnedDeps,
+    Storage, SubMsgResponse, Timestamp, TransactionInfo,
 };
 
 use cw_xcall_ibc_connection::{

contracts/cosmwasm-vm/cw-xcall-ibc-connection/tests/test_ibc.rs

@@ -1,8 +1,8 @@
 pub mod setup;
 
 use cosmwasm_std::{
-    to_binary, Addr, Binary, Ibc3ChannelOpenResponse, IbcAcknowledgement, IbcChannelCloseMsg,
-    IbcChannelConnectMsg, IbcChannelOpenMsg, IbcPacketAckMsg,
+    to_json_binary as to_binary, Addr, Binary, Ibc3ChannelOpenResponse, IbcAcknowledgement,
+    IbcChannelCloseMsg, IbcChannelConnectMsg, IbcChannelOpenMsg, IbcPacketAckMsg,
 };
 
 use cw_common::types::Ack;

contracts/cosmwasm-vm/cw-xcall-ibc-connection/tests/test_ibc_functions.rs

@@ -3,7 +3,7 @@ use std::str::FromStr;
 
 use common::rlp::{self, Nullable};
 use cosmwasm_std::{
-    testing::mock_env, to_binary, Addr, Binary, IbcAcknowledgement, IbcChannel,
+    testing::mock_env, to_json_binary as to_binary, Addr, Binary, IbcAcknowledgement, IbcChannel,
     IbcChannelConnectMsg::OpenAck, IbcChannelOpenMsg::OpenInit, IbcChannelOpenMsg::OpenTry,
     IbcEndpoint, IbcPacket, IbcPacketAckMsg, IbcPacketReceiveMsg, IbcTimeout, IbcTimeoutBlock,
 };
@@ -24,7 +24,7 @@ pub mod account;
 use account::admin_one;
 use account::alice;
 
-use cosmwasm_std::{from_binary, IbcChannelCloseMsg, Reply, SubMsgResult};
+use cosmwasm_std::{from_json as from_binary, IbcChannelCloseMsg, Reply, SubMsgResult};
 use cw_common::xcall_connection_msg::{ExecuteMsg, QueryMsg};
 use cw_xcall::types::message::CSMessage;
 use cw_xcall::types::request::CSMessageRequest;
@@ -219,7 +219,6 @@ fn test_query_get_unclaimed_fee() {
 #[test]
 #[cfg(not(feature = "native_ibc"))]
 fn success_on_open_channel_open_try_valid_version() {
-    use cosmwasm_std::from_binary;
     use cw_xcall_lib::network_address::NetId;
 
     let mut deps = deps();

contracts/cosmwasm-vm/cw-xcall-ibc-connection/tests/test_send_message.rs

@@ -2,7 +2,8 @@ pub mod setup;
 use std::str::FromStr;
 
 use cosmwasm_std::{
-    testing::mock_env, to_binary, Addr, IbcEndpoint, IbcPacket, IbcTimeout, IbcTimeoutBlock,
+    testing::mock_env, to_json_binary as to_binary, Addr, IbcEndpoint, IbcPacket, IbcTimeout,
+    IbcTimeoutBlock,
 };
 
 use cw_xcall_ibc_connection::types::config::Config;