diff --git a/contracts/neutron_interchain_queries/src/contract.rs b/contracts/neutron_interchain_queries/src/contract.rs index 6db7b11b..15336a5b 100644 --- a/contracts/neutron_interchain_queries/src/contract.rs +++ b/contracts/neutron_interchain_queries/src/contract.rs @@ -6,6 +6,7 @@ use cosmwasm_std::{ Response, StdError, StdResult, Uint128, }; use cw2::set_contract_version; +use neutron_std::types::ibc::core::client::v1::Height; use neutron_sdk::interchain_queries::v047::register_queries::new_register_validators_signing_infos_query_msg; use neutron_std::types::neutron::interchainqueries::{KvKey, RegisteredQuery}; @@ -13,7 +14,6 @@ use crate::msg::{ Cw20BalanceResponse, ExecuteMsg, GetRecipientTxsResponse, InstantiateMsg, MigrateMsg, QueryMsg, }; use crate::state::{Transfer, RECIPIENT_TXS, TRANSFERS}; -use neutron_sdk::bindings::types::Height; use neutron_sdk::interchain_queries::helpers::{ remove_interchain_query as helpers_remove_interchain_query, update_interchain_query as helpers_update_interchain_query, diff --git a/packages/neutron-sdk/src/bindings/msg.rs b/packages/neutron-sdk/src/bindings/msg.rs index bd2b4cd7..8ba453ea 100644 --- a/packages/neutron-sdk/src/bindings/msg.rs +++ b/packages/neutron-sdk/src/bindings/msg.rs @@ -39,44 +39,6 @@ impl From for CosmosMsg { impl CustomMsg for NeutronMsg {} -#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)] -#[serde(rename_all = "snake_case")] -/// Describes response structure for **RegisterInterchainQuery** msg. -pub struct MsgRegisterInterchainQueryResponse { - /// **id** is an identifier of newly registered interchain query. - pub id: u64, -} - -#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)] -#[serde(rename_all = "snake_case")] -/// MsgRegisterInterchainAccountResponse defines the Msg/RegisterInterchainAccount response type. -pub struct MsgRegisterInterchainAccountResponse { - /// **channel_id** is a ... - pub channel_id: String, - /// **port_id** is a ... - pub port_id: String, -} - -#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)] -#[serde(rename_all = "snake_case")] -/// MsgSubmitTxResponse defines the response for Msg/SubmitTx. -pub struct MsgSubmitTxResponse { - /// **sequence_id** is a channel's sequence_id for outgoing ibc packet. Unique per a channel. - pub sequence_id: u64, - /// **channel** is a src channel on neutron side transaction was submitted from. - pub channel: String, -} - -#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)] -#[serde(rename_all = "snake_case")] -/// MsgIbcTransferResponse defines the response for Msg/IbcTransfer. -pub struct MsgIbcTransferResponse { - /// **sequence_id** is a channel's sequence_id for outgoing ibc packet. Unique per a channel. - pub sequence_id: u64, - /// **channel** is a src channel on neutron side transaction was submitted from. - pub channel: String, -} - #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)] #[serde(rename_all = "snake_case")] /// AdminProposal defines the struct for various proposals which Neutron's Admin Module may accept. diff --git a/packages/neutron-sdk/src/bindings/types.rs b/packages/neutron-sdk/src/bindings/types.rs index 3c92fe92..21c24cb5 100644 --- a/packages/neutron-sdk/src/bindings/types.rs +++ b/packages/neutron-sdk/src/bindings/types.rs @@ -1,5 +1,3 @@ -use schemars::JsonSchema; -use serde::{Deserialize, Serialize}; use std::fmt::Write as _; // TODO: do we need it? @@ -20,14 +18,3 @@ pub fn decode_hex(s: &str) -> Option> { .map(|i| u8::from_str_radix(&s[i..i + 2], 16).ok()) .collect() } - -#[derive(Default, Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)] -#[serde(rename_all = "snake_case")] -pub struct Height { - /// the revision that the client is currently on - #[serde(default)] - pub revision_number: u64, - /// **height** is a height of remote chain - #[serde(default)] - pub revision_height: u64, -}