fix: add missing dependencies for some feature flags

informalsystems · Jan 25, 2024 · 32cb4c9 · 32cb4c9
1 parent 24a09d0
commit 32cb4c9
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 2 deletions.
diff --git a/.changelog/unreleased/bug-fixes/1059-add-missing-deps-for-feature-flags.md b/.changelog/unreleased/bug-fixes/1059-add-missing-deps-for-feature-flags.md
@@ -0,0 +1,2 @@
+- [ibc] Add missing dependencies for some feature flags across multiple crates
+  ([\#1059](https://github.com/cosmos/ibc-rs/issues/1059))
diff --git a/ibc-apps/ics721-nft-transfer/types/src/class.rs b/ibc-apps/ics721-nft-transfer/types/src/class.rs
@@ -6,6 +6,7 @@ use derive_more::From;
 use http::Uri;
 use ibc_core::host::types::identifiers::{ChannelId, PortId};
 use ibc_core::primitives::prelude::*;
+#[cfg(feature = "serde")]
 use ibc_core::primitives::serializers;
 use ibc_proto::ibc::applications::nft_transfer::v1::ClassTrace as RawClassTrace;
 

diff --git a/ibc-apps/ics721-nft-transfer/types/src/packet.rs b/ibc-apps/ics721-nft-transfer/types/src/packet.rs
@@ -5,7 +5,9 @@ use core::convert::TryFrom;
 use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
 use ibc_core::primitives::prelude::*;
-use ibc_core::primitives::{serializers, Signer};
+#[cfg(feature = "serde")]
+use ibc_core::primitives::serializers;
+use ibc_core::primitives::Signer;
 use ibc_proto::ibc::applications::nft_transfer::v1::NonFungibleTokenPacketData as RawPacketData;
 
 use crate::class::{ClassData, ClassUri, PrefixedClassId};

diff --git a/ibc-apps/ics721-nft-transfer/types/src/token.rs b/ibc-apps/ics721-nft-transfer/types/src/token.rs
@@ -4,6 +4,7 @@ use core::str::FromStr;
 
 use http::Uri;
 use ibc_core::primitives::prelude::*;
+#[cfg(feature = "serde")]
 use ibc_core::primitives::serializers;
 
 use crate::data::Data;

diff --git a/ibc-clients/ics08-wasm/types/Cargo.toml b/ibc-clients/ics08-wasm/types/Cargo.toml
@@ -36,6 +36,7 @@ default = ["std"]
 std = [
 	"ibc-core-client/std",
 	"ibc-core-host-types/std",
+	"ibc-primitives/std",
 	"ibc-proto/std",
 	"base64/std",
 	"serde/std"

diff --git a/ibc-core/Cargo.toml b/ibc-core/Cargo.toml
@@ -37,6 +37,7 @@ std = [
     "ibc-core-host/std",
     "ibc-core-router/std",
     "ibc-core-handler/std",
+    "ibc-primitives/std",
 ]
 serde = [
     "ibc-core-client/serde",
@@ -46,6 +47,7 @@ serde = [
     "ibc-core-host/serde",
     "ibc-core-router/serde",
     "ibc-core-handler/serde",
+    "ibc-primitives/serde",
 ]
 borsh = [
     "ibc-core-client/borsh",
@@ -55,6 +57,7 @@ borsh = [
     "ibc-core-host/borsh",
     "ibc-core-router/borsh",
     "ibc-core-handler/borsh",
+    "ibc-primitives/borsh",
 ]
 schema = [
     "ibc-core-client/schema",
@@ -64,13 +67,15 @@ schema = [
     "ibc-core-host/schema",
     "ibc-core-router/schema",
     "ibc-core-handler/schema",
+    "ibc-primitives/schema",
     "serde",
     "std"
 ]
 parity-scale-codec = [
     "ibc-core-client/parity-scale-codec",
     "ibc-core-connection/parity-scale-codec",
     "ibc-core-channel/parity-scale-codec",
+    "ibc-core-commitment-types/parity-scale-codec",
     "ibc-core-host/parity-scale-codec",
     "ibc-core-router/parity-scale-codec",
     "ibc-core-handler/parity-scale-codec",

diff --git a/ibc-core/ics02-client/context/Cargo.toml b/ibc-core/ics02-client/context/Cargo.toml
@@ -63,6 +63,7 @@ schema = [
     "ibc-core-client-types/schema",
     "ibc-core-host-types/schema",
     "ibc-core-handler-types/schema",
+    "ibc-primitives/schema",
     "serde",
     "std"
 ]

diff --git a/ibc-core/ics02-client/types/Cargo.toml b/ibc-core/ics02-client/types/Cargo.toml
@@ -77,7 +77,8 @@ schema = [
 parity-scale-codec = [
     "dep:parity-scale-codec",
     "dep:scale-info",
-    "ibc-core-commitment-types/parity-scale-codec",
     "ibc-core-host-types/parity-scale-codec",
+    "ibc-core-commitment-types/parity-scale-codec",
     "ibc-primitives/parity-scale-codec",
+    "ibc-proto/parity-scale-codec",
 ]
diff --git a/ibc-core/ics03-connection/Cargo.toml b/ibc-core/ics03-connection/Cargo.toml
@@ -43,6 +43,7 @@ schema = [
     "ibc-core-client/schema",
     "ibc-core-connection-types/schema",
     "ibc-core-host/schema",
+    "ibc-core-handler-types/schema",
     "ibc-primitives/schema",
     "serde",
     "std"

diff --git a/ibc-core/ics24-host/Cargo.toml b/ibc-core/ics24-host/Cargo.toml
@@ -62,6 +62,7 @@ serde = [
 ]
 schema = [
     "ibc-core-client-types/schema",
+    "ibc-core-client-context/schema",
     "ibc-core-connection-types/schema",
     "ibc-core-channel-types/schema",
     "ibc-core-commitment-types/schema",
@@ -73,6 +74,7 @@ schema = [
 ]
 borsh = [
     "ibc-core-client-types/borsh",
+    "ibc-core-client-context/borsh",
     "ibc-core-connection-types/borsh",
     "ibc-core-channel-types/borsh",
     "ibc-core-commitment-types/borsh",

diff --git a/ibc-core/ics24-host/cosmos/Cargo.toml b/ibc-core/ics24-host/cosmos/Cargo.toml
@@ -90,6 +90,7 @@ borsh = [
     "dep:borsh",
     "ibc-client-tendermint/borsh",
     "ibc-core-client-types/borsh",
+    "ibc-core-client-context/borsh",
     "ibc-core-connection-types/borsh",
     "ibc-core-commitment-types/borsh",
     "ibc-core-host-types/borsh",

diff --git a/ibc-core/ics25-handler/Cargo.toml b/ibc-core/ics25-handler/Cargo.toml
@@ -37,6 +37,7 @@ std = [
     "ibc-core-host/std",
     "ibc-core-router/std",
     "ibc-core-handler-types/std",
+    "ibc-primitives/std",
 ]
 serde = [
     "ibc-core-client/serde",
@@ -46,6 +47,7 @@ serde = [
     "ibc-core-host/serde",
     "ibc-core-router/serde",
     "ibc-core-handler-types/serde",
+    "ibc-primitives/serde",
 ]
 borsh = [
     "ibc-core-client/borsh",
@@ -55,6 +57,7 @@ borsh = [
     "ibc-core-host/borsh",
     "ibc-core-router/borsh",
     "ibc-core-handler-types/borsh",
+    "ibc-primitives/borsh",
 ]
 schema = [
     "ibc-core-client/schema",
@@ -64,6 +67,7 @@ schema = [
     "ibc-core-host/schema",
     "ibc-core-router/schema",
     "ibc-core-handler-types/schema",
+    "ibc-primitives/schema",
     "serde",
     "std"
 ]

diff --git a/ibc-data-types/Cargo.toml b/ibc-data-types/Cargo.toml
@@ -62,6 +62,7 @@ borsh = [
     "ibc-core-client-types/borsh",
     "ibc-core-connection-types/borsh",
     "ibc-core-channel-types/borsh",
+    "ibc-core-commitment-types/borsh",
     "ibc-core-host-types/borsh",
     "ibc-core-router-types/borsh",
     "ibc-core-handler-types/borsh",
@@ -73,6 +74,7 @@ schema = [
     "ibc-core-client-types/schema",
     "ibc-core-connection-types/schema",
     "ibc-core-channel-types/schema",
+    "ibc-core-commitment-types/schema",
     "ibc-core-host-types/schema",
     "ibc-core-router-types/schema",
     "ibc-core-handler-types/schema",
@@ -85,6 +87,7 @@ parity-scale-codec = [
     "ibc-core-client-types/parity-scale-codec",
     "ibc-core-connection-types/parity-scale-codec",
     "ibc-core-channel-types/parity-scale-codec",
+    "ibc-core-commitment-types/parity-scale-codec",
     "ibc-core-host-types/parity-scale-codec",
     "ibc-core-router-types/parity-scale-codec",
     "ibc-core-handler-types/parity-scale-codec",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- [ibc] Add missing dependencies for some feature flags across multiple crates
		([\#1059](https://github.com/cosmos/ibc-rs/issues/1059))