diff --git a/cosmwasm/polytone/contracts/main/note/src/contract.rs b/cosmwasm/polytone/contracts/main/note/src/contract.rs index e415857c..1725388e 100644 --- a/cosmwasm/polytone/contracts/main/note/src/contract.rs +++ b/cosmwasm/polytone/contracts/main/note/src/contract.rs @@ -1,7 +1,8 @@ #[cfg(not(feature = "library"))] use cosmwasm_std::entry_point; use cosmwasm_std::{ - to_json_binary, Binary, Deps, DepsMut, Env, IbcMsg, IbcTimeout, MessageInfo, Response, StdResult, + to_json_binary, Binary, Deps, DepsMut, Env, IbcMsg, IbcTimeout, MessageInfo, Response, + StdResult, }; use cw2::set_contract_version; use polytone::callbacks::CallbackRequestType; diff --git a/cosmwasm/polytone/contracts/main/note/src/msg.rs b/cosmwasm/polytone/contracts/main/note/src/msg.rs index 5905eda7..3f3cf20c 100644 --- a/cosmwasm/polytone/contracts/main/note/src/msg.rs +++ b/cosmwasm/polytone/contracts/main/note/src/msg.rs @@ -88,4 +88,4 @@ pub enum MigrateMsg { /// Updates the contract's configuration. To update the config /// without updating the code, migrate to the same code ID. WithUpdate { block_max_gas: Uint64 }, -} \ No newline at end of file +} diff --git a/cosmwasm/polytone/contracts/main/proxy/src/contract.rs b/cosmwasm/polytone/contracts/main/proxy/src/contract.rs index 0e3e3e3b..99ed2baf 100644 --- a/cosmwasm/polytone/contracts/main/proxy/src/contract.rs +++ b/cosmwasm/polytone/contracts/main/proxy/src/contract.rs @@ -1,7 +1,7 @@ #[cfg(not(feature = "library"))] use cosmwasm_std::entry_point; use cosmwasm_std::{ - to_json_binary, Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response, StdResult, SubMsg, + to_json_binary, Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response, StdResult, SubMsg, SubMsgResponse, SubMsgResult, }; use cw2::set_contract_version; @@ -65,7 +65,7 @@ pub fn execute( #[cfg_attr(not(feature = "library"), entry_point)] pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult { match msg { - QueryMsg::Instantiator {} => to_json_binary(&INSTANTIATOR.load(deps.storage)?), + QueryMsg::Instantiator {} => to_json_binary(&INSTANTIATOR.load(deps.storage)?), } } diff --git a/cosmwasm/polytone/contracts/main/voice/src/contract.rs b/cosmwasm/polytone/contracts/main/voice/src/contract.rs index 7d8bb7bf..15996fbc 100644 --- a/cosmwasm/polytone/contracts/main/voice/src/contract.rs +++ b/cosmwasm/polytone/contracts/main/voice/src/contract.rs @@ -274,4 +274,4 @@ mod tests { let four = gen_address("c1", "c1", "c2"); assert!(one != two && two != three && three != four) } -} \ No newline at end of file +} diff --git a/cosmwasm/polytone/contracts/main/voice/src/ibc.rs b/cosmwasm/polytone/contracts/main/voice/src/ibc.rs index 5cfe8170..8703b832 100644 --- a/cosmwasm/polytone/contracts/main/voice/src/ibc.rs +++ b/cosmwasm/polytone/contracts/main/voice/src/ibc.rs @@ -172,4 +172,4 @@ pub fn ibc_packet_timeout( _msg: IbcPacketTimeoutMsg, ) -> Result { unreachable!("host will never send a packet") -} \ No newline at end of file +} diff --git a/cosmwasm/polytone/contracts/main/voice/src/msg.rs b/cosmwasm/polytone/contracts/main/voice/src/msg.rs index 00be038c..37f3b1ea 100644 --- a/cosmwasm/polytone/contracts/main/voice/src/msg.rs +++ b/cosmwasm/polytone/contracts/main/voice/src/msg.rs @@ -59,4 +59,4 @@ pub enum MigrateMsg { /// The contract address length used by the chain. contract_addr_len: u8, }, -} \ No newline at end of file +} diff --git a/cosmwasm/polytone/contracts/main/voice/src/state.rs b/cosmwasm/polytone/contracts/main/voice/src/state.rs index f13f1e91..476b3526 100644 --- a/cosmwasm/polytone/contracts/main/voice/src/state.rs +++ b/cosmwasm/polytone/contracts/main/voice/src/state.rs @@ -25,4 +25,4 @@ pub struct SenderInfo { pub connection_id: String, pub remote_port: String, pub remote_sender: String, -} \ No newline at end of file +} diff --git a/cosmwasm/polytone/contracts/main/voice/src/suite_tests/suite.rs b/cosmwasm/polytone/contracts/main/voice/src/suite_tests/suite.rs index e25f5248..d59160e8 100644 --- a/cosmwasm/polytone/contracts/main/voice/src/suite_tests/suite.rs +++ b/cosmwasm/polytone/contracts/main/voice/src/suite_tests/suite.rs @@ -148,4 +148,4 @@ impl Suite { let curr = self.query_contract_addr_len(); assert_eq!(curr, val); } -} \ No newline at end of file +} diff --git a/cosmwasm/polytone/contracts/main/voice/src/suite_tests/tests.rs b/cosmwasm/polytone/contracts/main/voice/src/suite_tests/tests.rs index c5e9b622..68d9e95d 100644 --- a/cosmwasm/polytone/contracts/main/voice/src/suite_tests/tests.rs +++ b/cosmwasm/polytone/contracts/main/voice/src/suite_tests/tests.rs @@ -130,4 +130,4 @@ fn test_migrate_validation() { .unwrap(); assert_eq!(err, ContractError::ContractAddrLenCantBeGreaterThan32); -} \ No newline at end of file +} diff --git a/cosmwasm/polytone/packages/cw-orch-polytone/src/deploy.rs b/cosmwasm/polytone/packages/cw-orch-polytone/src/deploy.rs index fe912296..78f70953 100644 --- a/cosmwasm/polytone/packages/cw-orch-polytone/src/deploy.rs +++ b/cosmwasm/polytone/packages/cw-orch-polytone/src/deploy.rs @@ -91,4 +91,4 @@ impl Polytone { Polytone { note, voice, proxy } } -} \ No newline at end of file +} diff --git a/cosmwasm/polytone/packages/cw-orch-polytone/src/note.rs b/cosmwasm/polytone/packages/cw-orch-polytone/src/note.rs index 341d5efa..16bdb592 100644 --- a/cosmwasm/polytone/packages/cw-orch-polytone/src/note.rs +++ b/cosmwasm/polytone/packages/cw-orch-polytone/src/note.rs @@ -32,4 +32,4 @@ impl Uploadable for PolytoneNote { .find_wasm_path("polytone_note") .unwrap() } -} \ No newline at end of file +} diff --git a/cosmwasm/polytone/packages/cw-orch-polytone/src/proxy.rs b/cosmwasm/polytone/packages/cw-orch-polytone/src/proxy.rs index bb136e6f..8e6d0e03 100644 --- a/cosmwasm/polytone/packages/cw-orch-polytone/src/proxy.rs +++ b/cosmwasm/polytone/packages/cw-orch-polytone/src/proxy.rs @@ -24,4 +24,4 @@ impl Uploadable for PolytoneProxy { .find_wasm_path("polytone_proxy") .unwrap() } -} \ No newline at end of file +} diff --git a/cosmwasm/polytone/packages/cw-orch-polytone/src/voice.rs b/cosmwasm/polytone/packages/cw-orch-polytone/src/voice.rs index 1e2603f2..fc1fabeb 100644 --- a/cosmwasm/polytone/packages/cw-orch-polytone/src/voice.rs +++ b/cosmwasm/polytone/packages/cw-orch-polytone/src/voice.rs @@ -32,4 +32,4 @@ impl Uploadable for PolytoneVoice { .find_wasm_path("polytone_voice") .unwrap() } -} \ No newline at end of file +} diff --git a/cosmwasm/polytone/packages/polytone/src/ack.rs b/cosmwasm/polytone/packages/polytone/src/ack.rs index effda1a5..a0203ad8 100644 --- a/cosmwasm/polytone/packages/polytone/src/ack.rs +++ b/cosmwasm/polytone/packages/polytone/src/ack.rs @@ -1,4 +1,4 @@ -use cosmwasm_std::{from_json, to_json_binary, Binary, IbcAcknowledgement, SubMsgResponse, Uint64}; +use cosmwasm_std::{from_json, to_json_binary, Binary, IbcAcknowledgement, SubMsgResponse, Uint64}; pub use crate::callbacks::Callback; use crate::callbacks::{ErrorResponse, ExecutionResponse}; @@ -12,12 +12,12 @@ pub type Ack = Callback; /// Serializes an ACK-SUCCESS containing the provided data. pub fn ack_query_success(result: Vec) -> Binary { - to_json_binary(&Callback::Query(Ok(result))).unwrap() + to_json_binary(&Callback::Query(Ok(result))).unwrap() } /// Serializes an ACK-SUCCESS for a query that failed. pub fn ack_query_fail(message_index: Uint64, error: String) -> Binary { - to_json_binary(&Callback::Query(Err(ErrorResponse { + to_json_binary(&Callback::Query(Err(ErrorResponse { message_index, error, }))) @@ -26,7 +26,7 @@ pub fn ack_query_fail(message_index: Uint64, error: String) -> Binary { /// Serializes an ACK-SUCCESS for execution that succeeded. pub fn ack_execute_success(result: Vec, executed_by: String) -> Binary { - to_json_binary(&Callback::Execute(Ok(ExecutionResponse { + to_json_binary(&Callback::Execute(Ok(ExecutionResponse { result, executed_by, }))) @@ -35,12 +35,12 @@ pub fn ack_execute_success(result: Vec, executed_by: String) -> /// Serializes an ACK-SUCCESS for execution that failed. pub fn ack_execute_fail(error: String) -> Binary { - to_json_binary(&Callback::Execute(Err(error))).unwrap() + to_json_binary(&Callback::Execute(Err(error))).unwrap() } /// Serializes an ACK-FAIL containing the provided error. pub fn ack_fail(err: String) -> Binary { - to_json_binary(&Callback::FatalError(err)).unwrap() + to_json_binary(&Callback::FatalError(err)).unwrap() } /// Unmarshals an ACK from an acknowledgement returned by the SDK. If diff --git a/cosmwasm/polytone/packages/polytone/src/callbacks.rs b/cosmwasm/polytone/packages/polytone/src/callbacks.rs index 3c4c1adb..b35c10cf 100644 --- a/cosmwasm/polytone/packages/polytone/src/callbacks.rs +++ b/cosmwasm/polytone/packages/polytone/src/callbacks.rs @@ -1,6 +1,6 @@ use cosmwasm_schema::cw_serde; use cosmwasm_std::{ - to_json_binary, Addr, Api, Binary, CosmosMsg, IbcPacketAckMsg, IbcPacketTimeoutMsg, StdResult, + to_json_binary, Addr, Api, Binary, CosmosMsg, IbcPacketAckMsg, IbcPacketTimeoutMsg, StdResult, Storage, SubMsgResponse, Uint64, WasmMsg, }; use cw_storage_plus::Map; @@ -178,7 +178,7 @@ fn callback_message(request: PendingCallback, result: Callback) -> CosmosMsg { } WasmMsg::Execute { contract_addr: request.receiver.into_string(), - msg: to_json_binary(&C::Callback(CallbackMessage { + msg: to_json_binary(&C::Callback(CallbackMessage { initiator: request.initiator, initiator_msg: request.initiator_msg, result, diff --git a/cosmwasm/polytone/packages/polytone/src/handshake/mod.rs b/cosmwasm/polytone/packages/polytone/src/handshake/mod.rs index 5ffa57a3..b7d256dc 100644 --- a/cosmwasm/polytone/packages/polytone/src/handshake/mod.rs +++ b/cosmwasm/polytone/packages/polytone/src/handshake/mod.rs @@ -1,5 +1,5 @@ use cosmwasm_std::{ - to_json_binary, Ibc3ChannelOpenResponse, IbcChannelOpenMsg, IbcChannelOpenResponse, IbcOrder, + to_json_binary, Ibc3ChannelOpenResponse, IbcChannelOpenMsg, IbcChannelOpenResponse, IbcOrder, }; use error::HandshakeError; @@ -59,7 +59,7 @@ fn open( Err(HandshakeError::ExpectUnordered) } else { Ok(Some(Ibc3ChannelOpenResponse { - version: to_json_binary(extensions).unwrap().to_base64(), + version: to_json_binary(extensions).unwrap().to_base64(), })) } }