From 9798b599c57621bb43c2017a8575bfaffd796ee8 Mon Sep 17 00:00:00 2001 From: Kayanski Date: Wed, 15 Jan 2025 10:04:54 +0100 Subject: [PATCH] Nits again --- cosmwasm/ibc-union/core/Cargo.toml | 2 +- cosmwasm/ibc-union/core/msg/Cargo.toml | 3 ++- cosmwasm/ibc-union/core/src/lib.rs | 3 ++- lib/unionlabs-primitives/src/fixed_bytes.rs | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cosmwasm/ibc-union/core/Cargo.toml b/cosmwasm/ibc-union/core/Cargo.toml index 011ff83f59..7b33a8d142 100644 --- a/cosmwasm/ibc-union/core/Cargo.toml +++ b/cosmwasm/ibc-union/core/Cargo.toml @@ -13,7 +13,7 @@ workspace = true crate-type = ["cdylib", "rlib"] [features] -cw-orch-interface = [] +cw-orch-interface = ["dep:cosmwasm-schema", "dep:cw-orch"] library = [] [dependencies] diff --git a/cosmwasm/ibc-union/core/msg/Cargo.toml b/cosmwasm/ibc-union/core/msg/Cargo.toml index b22c66e5fd..42bcd7f8f0 100644 --- a/cosmwasm/ibc-union/core/msg/Cargo.toml +++ b/cosmwasm/ibc-union/core/msg/Cargo.toml @@ -16,11 +16,12 @@ cw-orch-interface = [ "dep:cosmwasm-std", "dep:cosmwasm-schema", "unionlabs-primitives/schemars", + "ibc-solidity/schemars", ] schemars = [] [dependencies] -ibc-solidity = { workspace = true, features = ["serde", "schemars"] } +ibc-solidity = { workspace = true, features = ["serde"] } serde = { workspace = true, features = ["derive"] } unionlabs-primitives = { workspace = true, features = ["serde"] } diff --git a/cosmwasm/ibc-union/core/src/lib.rs b/cosmwasm/ibc-union/core/src/lib.rs index 2fda1a13d5..e87758e22c 100644 --- a/cosmwasm/ibc-union/core/src/lib.rs +++ b/cosmwasm/ibc-union/core/src/lib.rs @@ -1,8 +1,9 @@ #![cfg_attr(not(test), warn(clippy::unwrap_used))] pub mod contract; -pub mod state; +#[cfg(feature = "cw-orch-interface")] pub mod interface; +pub mod state; use cosmwasm_std::{Addr, StdError}; use ibc_solidity::{ChannelState, ConnectionState}; diff --git a/lib/unionlabs-primitives/src/fixed_bytes.rs b/lib/unionlabs-primitives/src/fixed_bytes.rs index 5d4a7c2538..6a3602c914 100644 --- a/lib/unionlabs-primitives/src/fixed_bytes.rs +++ b/lib/unionlabs-primitives/src/fixed_bytes.rs @@ -239,10 +239,10 @@ impl<'de, const BYTES: usize, E: Encoding> serde::Deserialize<'de> for FixedByte #[cfg(feature = "schemars")] impl schemars::JsonSchema for FixedBytes { fn schema_name() -> String { - format!("Hash") + "Hash".to_string() } - /// The FixedBytes object is serialized as an array in JSON + /// The `FixedBytes` object is serialized as an array in JSON fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema { let mut schema_object = schemars::schema::SchemaObject { instance_type: Some(schemars::schema::InstanceType::Array.into()),