simplify features

Author: Thoralf-M

crates/iota-crypto/src/simple.rs

@@ -467,18 +467,23 @@ mod keypair {
     }
 }
 
-#[cfg(all(test, feature = "pem"))]
+#[cfg(all(
+    test,
+    feature = "ed25519",
+    feature = "secp256k1",
+    feature = "secp256r1"
+))]
 mod test {
     use test_strategy::proptest;
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 
     use super::*;
-    use crate::ed25519::{Ed25519PrivateKey, Ed25519VerifyingKey};
-    #[cfg(feature = "secp256k1")]
-    use crate::secp256k1::{Secp256k1PrivateKey, Secp256k1VerifyingKey};
-    #[cfg(feature = "secp256r1")]
-    use crate::secp256r1::{Secp256r1PrivateKey, Secp256r1VerifyingKey};
+    use crate::{
+        ed25519::{Ed25519PrivateKey, Ed25519VerifyingKey},
+        secp256k1::{Secp256k1PrivateKey, Secp256k1VerifyingKey},
+        secp256r1::{Secp256r1PrivateKey, Secp256r1VerifyingKey},
+    };
 
     #[proptest]
     fn ed25519_pem_der(signer: Ed25519PrivateKey) {
@@ -495,13 +500,9 @@ mod test {
         assert_eq!(from_pem.public_key(), public_key);
 
         // der and pem bytes don't convert to secp256r1 or secp256k1
-        #[cfg(feature = "secp256r1")]
         Secp256r1PrivateKey::from_der(&ed25519_der).unwrap_err();
-        #[cfg(feature = "secp256r1")]
         Secp256r1PrivateKey::from_pem(&ed25519_pem).unwrap_err();
-        #[cfg(feature = "secp256k1")]
         Secp256k1PrivateKey::from_der(&ed25519_der).unwrap_err();
-        #[cfg(feature = "secp256k1")]
         Secp256k1PrivateKey::from_pem(&ed25519_pem).unwrap_err();
 
         // SimpleKeypair parses
@@ -523,13 +524,9 @@ mod test {
         assert_eq!(from_pem.public_key(), public_key);
 
         // der and pem bytes don't convert to secp256r1 or secp256k1
-        #[cfg(feature = "secp256r1")]
         Secp256r1VerifyingKey::from_der(&der).unwrap_err();
-        #[cfg(feature = "secp256r1")]
         Secp256r1VerifyingKey::from_pem(&pem).unwrap_err();
-        #[cfg(feature = "secp256k1")]
         Secp256k1VerifyingKey::from_der(&der).unwrap_err();
-        #[cfg(feature = "secp256k1")]
         Secp256k1VerifyingKey::from_pem(&pem).unwrap_err();
 
         // SimpleKeypair parses
@@ -539,7 +536,6 @@ mod test {
         assert_eq!(pem, from_pem.to_pem().unwrap());
     }
 
-    #[cfg(feature = "secp256r1")]
     #[proptest]
     fn secp256r1_pem_der(signer: Secp256r1PrivateKey) {
         // Private Key
@@ -591,7 +587,6 @@ mod test {
         assert_eq!(pem, from_pem.to_pem().unwrap());
     }
 
-    #[cfg(feature = "secp256k1")]
     #[proptest]
     fn secp256k1_pem_der(signer: Secp256k1PrivateKey) {
         // Private Key

crates/iota-sdk-types/src/crypto/passkey.rs

@@ -404,13 +404,11 @@ impl proptest::arbitrary::Arbitrary for PasskeyAuthenticator {
     }
 }
 
-#[cfg(test)]
+#[cfg(all(feature = "serde", test))]
 mod tests {
-    #[cfg(feature = "serde")]
     use crate::UserSignature;
 
     #[test]
-    #[cfg(feature = "serde")]
     fn base64_encoded_passkey_user_signature() {
         let b64 = "BiVYDmenOnqS+thmz5m5SrZnWaKXZLVxgh+rri6LHXs25B0AAAAAnQF7InR5cGUiOiJ3ZWJhdXRobi5nZXQiLCAiY2hhbGxlbmdlIjoiQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQSIsIm9yaWdpbiI6Imh0dHA6Ly9sb2NhbGhvc3Q6NTE3MyIsImNyb3NzT3JpZ2luIjpmYWxzZSwgInVua25vd24iOiAidW5rbm93biJ9YgJMwqcOmZI7F/N+K5SMe4DRYCb4/cDWW68SFneSHoD2GxKKhksbpZ5rZpdrjSYABTCsFQQBpLORzTvbj4edWKd/AsEBeovrGvHR9Ku7critg6k7qvfFlPUngujXfEzXd8Eg";
 

crates/iota-sdk-types/src/crypto/validator.rs

@@ -161,15 +161,13 @@ pub struct ValidatorSignature {
     pub signature: Bls12381Signature,
 }
 
-#[cfg(test)]
+#[cfg(all(feature = "serde", test))]
 mod test {
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 
-    #[cfg(feature = "serde")]
     use super::*;
 
-    #[cfg(feature = "serde")]
     #[test]
     fn aggregated_signature_fixture() {
         use base64ct::{Base64, Encoding};

crates/iota-sdk-types/src/gas.rs

@@ -127,16 +127,14 @@ impl std::fmt::Display for GasCostSummary {
     }
 }
 
-#[cfg(test)]
+#[cfg(all(feature = "serde", test))]
 mod test {
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 
-    #[cfg(feature = "serde")]
     use super::*;
 
     #[test]
-    #[cfg(feature = "serde")]
     fn formats() {
         let actual = GasCostSummary {
             computation_cost: 42,

crates/iota-sdk-types/src/transaction/mod.rs

@@ -691,7 +691,7 @@ pub struct ChangeEpochV2 {
     /// write out the modules below.  Modules are provided with the version they
     /// will be upgraded to, their modules in serialized form (which include
     /// their package ID), and a list of their transitive dependencies.
-    #[cfg_attr(feature = "proptest", any(proptest::collection::size_range(0..=2).lift()))]
+    #[cfg_attr(all(test, feature = "proptest"), any(proptest::collection::size_range(0..=2).lift()))]
     pub system_packages: Vec<SystemPackage>,
 }
 

crates/iota-sdk-types/src/u256.rs

@@ -112,8 +112,8 @@ mod test {
         assert_eq!(one_platform, U256::from_be(U256::from_digits(one_be)));
     }
 
-    #[proptest]
     #[cfg(feature = "proptest")]
+    #[proptest]
     fn dont_crash_on_large_inputs(
         #[strategy(proptest::collection::vec(any::<u8>(), 33..1024))] bytes: Vec<u8>,
     ) {
@@ -124,8 +124,8 @@ mod test {
         let _ = U256::from_str_radix(&radix10, 10);
     }
 
-    #[proptest]
     #[cfg(feature = "proptest")]
+    #[proptest]
     fn valid_u256_strings(
         #[strategy(proptest::collection::vec(any::<u8>(), 1..=32))] bytes: Vec<u8>,
     ) {