Merge pull request #3748 from nymtech/feature/fix_default_packet_type

nymtech · Aug 7, 2023 · 695d347 · 695d347
2 parents 49440bf + 314d7a7
commit 695d347
Show file tree

Hide file tree

Showing 7 changed files with 233 additions and 18 deletions.
diff --git a/common/crypto/Cargo.toml b/common/crypto/Cargo.toml
@@ -34,6 +34,7 @@ nym-pemstore = { path = "../../common/pemstore", version = "0.3.0" }
 rand_chacha = "0.2"
 
 [features]
+default = ["sphinx"]
 serde = ["serde_crate", "serde_bytes", "ed25519-dalek/serde", "x25519-dalek/serde"]
 asymmetric = ["x25519-dalek", "ed25519-dalek", "zeroize"]
 hashing = ["blake3", "digest", "hkdf", "hmac", "generic-array"]

diff --git a/common/nymsphinx/Cargo.toml b/common/nymsphinx/Cargo.toml
@@ -40,3 +40,8 @@ path = "framing"
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio]
 version = "1.24.1"
 features = ["sync"]
+
+[features]
+default = ["sphinx"]
+sphinx = ["nym-crypto/sphinx", "nym-sphinx-params/sphinx", "nym-sphinx-types/sphinx"]
+outfox = ["nym-crypto/outfox", "nym-sphinx-params/outfox", "nym-sphinx-types/outfox"]
diff --git a/common/nymsphinx/framing/Cargo.toml b/common/nymsphinx/framing/Cargo.toml
@@ -12,5 +12,6 @@ bytes = "1.0"
 tokio-util = { version = "0.7.4", features = ["codec"] }
 thiserror = "1.0.37"
 
-nym-sphinx-types = { path = "../types" }
-nym-sphinx-params = { path = "../params" }
+nym-sphinx-types = { path = "../types", features = ["sphinx", "outfox"] }
+nym-sphinx-params = { path = "../params", features = ["sphinx", "outfox"] }
+
diff --git a/common/nymsphinx/params/Cargo.toml b/common/nymsphinx/params/Cargo.toml
@@ -15,5 +15,6 @@ nym-crypto = { path = "../../crypto", features = ["hashing", "symmetric"] }
 nym-sphinx-types = { path = "../types" }
 
 [features]
+default = ["sphinx"]
 sphinx = ["nym-crypto/sphinx", "nym-sphinx-types/outfox"]
 outfox = ["nym-crypto/outfox", "nym-sphinx-types/outfox"]
diff --git a/common/nymsphinx/types/Cargo.toml b/common/nymsphinx/types/Cargo.toml
@@ -13,5 +13,6 @@ nym-outfox = { path = "../../../nym-outfox", optional = true }
 thiserror = "1"
 
 [features]
+default = ["sphinx"]
 sphinx = ["sphinx-packet"]
 outfox = ["nym-outfox"]