Skip to content

Commit b584ded

Browse files
Thoralf-MThoralf-M
committed
fix: fix feature flags for tests
1 parent c679199 commit b584ded

File tree

13 files changed

+45
-9
lines changed

13 files changed

+45
-9
lines changed

‎crates/iota-crypto/src/simple.rs‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -467,18 +467,18 @@ mod keypair {
467467
}
468468
}
469469

470-
#[cfg(test)]
470+
#[cfg(all(test, feature = "pem"))]
471471
mod test {
472472
use test_strategy::proptest;
473473
#[cfg(target_arch = "wasm32")]
474474
use wasm_bindgen_test::wasm_bindgen_test as test;
475475

476476
use super::*;
477-
use crate::{
478-
ed25519::{Ed25519PrivateKey, Ed25519VerifyingKey},
479-
secp256k1::{Secp256k1PrivateKey, Secp256k1VerifyingKey},
480-
secp256r1::{Secp256r1PrivateKey, Secp256r1VerifyingKey},
481-
};
477+
use crate::ed25519::{Ed25519PrivateKey, Ed25519VerifyingKey};
478+
#[cfg(feature = "secp256k1")]
479+
use crate::secp256k1::{Secp256k1PrivateKey, Secp256k1VerifyingKey};
480+
#[cfg(feature = "secp256r1")]
481+
use crate::secp256r1::{Secp256r1PrivateKey, Secp256r1VerifyingKey};
482482

483483
#[proptest]
484484
fn ed25519_pem_der(signer: Ed25519PrivateKey) {
@@ -495,9 +495,13 @@ mod test {
495495
assert_eq!(from_pem.public_key(), public_key);
496496

497497
// der and pem bytes don't convert to secp256r1 or secp256k1
498+
#[cfg(feature = "secp256r1")]
498499
Secp256r1PrivateKey::from_der(&ed25519_der).unwrap_err();
500+
#[cfg(feature = "secp256r1")]
499501
Secp256r1PrivateKey::from_pem(&ed25519_pem).unwrap_err();
502+
#[cfg(feature = "secp256k1")]
500503
Secp256k1PrivateKey::from_der(&ed25519_der).unwrap_err();
504+
#[cfg(feature = "secp256k1")]
501505
Secp256k1PrivateKey::from_pem(&ed25519_pem).unwrap_err();
502506

503507
// SimpleKeypair parses
@@ -519,9 +523,13 @@ mod test {
519523
assert_eq!(from_pem.public_key(), public_key);
520524

521525
// der and pem bytes don't convert to secp256r1 or secp256k1
526+
#[cfg(feature = "secp256r1")]
522527
Secp256r1VerifyingKey::from_der(&der).unwrap_err();
528+
#[cfg(feature = "secp256r1")]
523529
Secp256r1VerifyingKey::from_pem(&pem).unwrap_err();
530+
#[cfg(feature = "secp256k1")]
524531
Secp256k1VerifyingKey::from_der(&der).unwrap_err();
532+
#[cfg(feature = "secp256k1")]
525533
Secp256k1VerifyingKey::from_pem(&pem).unwrap_err();
526534

527535
// SimpleKeypair parses
@@ -531,6 +539,7 @@ mod test {
531539
assert_eq!(pem, from_pem.to_pem().unwrap());
532540
}
533541

542+
#[cfg(feature = "secp256r1")]
534543
#[proptest]
535544
fn secp256r1_pem_der(signer: Secp256r1PrivateKey) {
536545
// Private Key
@@ -582,6 +591,7 @@ mod test {
582591
assert_eq!(pem, from_pem.to_pem().unwrap());
583592
}
584593

594+
#[cfg(feature = "secp256k1")]
585595
#[proptest]
586596
fn secp256k1_pem_der(signer: Secp256k1PrivateKey) {
587597
// Private Key

‎crates/iota-sdk-types/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ serde = [
3636
schemars = ["serde", "dep:schemars", "dep:serde_json"]
3737
rand = ["dep:rand_core"]
3838
hash = ["dep:blake2"]
39-
proptest = ["dep:proptest", "dep:test-strategy", "serde"]
39+
proptest = ["dep:proptest", "dep:test-strategy", "serde", "schemars"]
4040

4141
[dependencies]
4242
base64ct = { version = "1.6.0", features = ["alloc"] }

‎crates/iota-sdk-types/src/address.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ impl schemars::JsonSchema for Address {
283283

284284
#[cfg(test)]
285285
mod test {
286+
#[cfg(feature = "proptest")]
286287
use test_strategy::proptest;
287288
#[cfg(target_arch = "wasm32")]
288289
use wasm_bindgen_test::wasm_bindgen_test as test;
@@ -309,6 +310,7 @@ mod test {
309310
}
310311

311312
#[proptest]
313+
#[cfg(feature = "proptest")]
312314
fn roundtrip_display_fromstr(address: Address) {
313315
let s = address.to_string();
314316
let a = s.parse::<Address>().unwrap();

‎crates/iota-sdk-types/src/crypto/mod.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,16 @@ macro_rules! impl_base64_helper {
135135

136136
#[cfg(test)]
137137
mod $test_module {
138+
#[cfg(feature = "proptest")]
138139
use test_strategy::proptest;
139140
#[cfg(target_arch = "wasm32")]
140141
use wasm_bindgen_test::wasm_bindgen_test as test;
141142

143+
#[cfg(feature = "proptest")]
142144
use super::{$display, $fromstr};
143145

144146
#[proptest]
147+
#[cfg(feature = "proptest")]
145148
fn roundtrip_display_fromstr(array: $fromstr) {
146149
let s = $display(&array.0).to_string();
147150
let a = s.parse::<$fromstr>().unwrap();

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,9 +406,11 @@ impl proptest::arbitrary::Arbitrary for PasskeyAuthenticator {
406406

407407
#[cfg(test)]
408408
mod tests {
409+
#[cfg(feature = "serde")]
409410
use crate::UserSignature;
410411

411412
#[test]
413+
#[cfg(feature = "serde")]
412414
fn base64_encoded_passkey_user_signature() {
413415
let b64 = "BiVYDmenOnqS+thmz5m5SrZnWaKXZLVxgh+rri6LHXs25B0AAAAAnQF7InR5cGUiOiJ3ZWJhdXRobi5nZXQiLCAiY2hhbGxlbmdlIjoiQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQSIsIm9yaWdpbiI6Imh0dHA6Ly9sb2NhbGhvc3Q6NTE3MyIsImNyb3NzT3JpZ2luIjpmYWxzZSwgInVua25vd24iOiAidW5rbm93biJ9YgJMwqcOmZI7F/N+K5SMe4DRYCb4/cDWW68SFneSHoD2GxKKhksbpZ5rZpdrjSYABTCsFQQBpLORzTvbj4edWKd/AsEBeovrGvHR9Ku7critg6k7qvfFlPUngujXfEzXd8Eg";
414416

‎crates/iota-sdk-types/src/crypto/signature.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,13 +684,15 @@ mod serialization {
684684
#[cfg(test)]
685685
mod test {
686686
use base64ct::{Base64, Encoding};
687+
#[cfg(feature = "proptest")]
687688
use test_strategy::proptest;
688689
#[cfg(target_arch = "wasm32")]
689690
use wasm_bindgen_test::wasm_bindgen_test as test;
690691

691692
use super::*;
692693

693694
#[proptest]
695+
#[cfg(feature = "proptest")]
694696
fn roundtrip_signature_scheme(scheme: SignatureScheme) {
695697
assert_eq!(Ok(scheme), SignatureScheme::from_byte(scheme.to_u8()));
696698
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ mod test {
166166
#[cfg(target_arch = "wasm32")]
167167
use wasm_bindgen_test::wasm_bindgen_test as test;
168168

169+
#[cfg(feature = "serde")]
169170
use super::*;
170171

171172
#[cfg(feature = "serde")]

‎crates/iota-sdk-types/src/crypto/zklogin.rs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,10 +360,14 @@ impl std::str::FromStr for Bn254FieldElement {
360360

361361
#[cfg(test)]
362362
mod test {
363+
#[cfg(feature = "proptest")]
363364
use std::str::FromStr;
364365

366+
#[cfg(feature = "proptest")]
365367
use num_bigint::BigUint;
368+
#[cfg(feature = "proptest")]
366369
use proptest::prelude::*;
370+
#[cfg(feature = "proptest")]
367371
use test_strategy::proptest;
368372
#[cfg(target_arch = "wasm32")]
369373
use wasm_bindgen_test::wasm_bindgen_test as test;
@@ -382,6 +386,7 @@ mod test {
382386
}
383387

384388
#[proptest]
389+
#[cfg(feature = "proptest")]
385390
fn dont_crash_on_large_inputs(
386391
#[strategy(proptest::collection::vec(any::<u8>(), 33..1024))] bytes: Vec<u8>,
387392
) {
@@ -393,6 +398,7 @@ mod test {
393398
}
394399

395400
#[proptest]
401+
#[cfg(feature = "proptest")]
396402
fn valid_address_seeds(
397403
#[strategy(proptest::collection::vec(any::<u8>(), 1..=32))] bytes: Vec<u8>,
398404
) {

‎crates/iota-sdk-types/src/digest.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,13 +349,16 @@ pub type SigningDigest = [u8; Digest::LENGTH];
349349

350350
#[cfg(test)]
351351
mod test {
352+
#[cfg(feature = "proptest")]
352353
use test_strategy::proptest;
353354
#[cfg(target_arch = "wasm32")]
354355
use wasm_bindgen_test::wasm_bindgen_test as test;
355356

357+
#[cfg(feature = "proptest")]
356358
use super::*;
357359

358360
#[proptest]
361+
#[cfg(feature = "proptest")]
359362
fn roundtrip_display_fromstr(digest: Digest) {
360363
let s = digest.to_string();
361364
let d = s.parse::<Digest>().unwrap();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ mod test {
132132
#[cfg(target_arch = "wasm32")]
133133
use wasm_bindgen_test::wasm_bindgen_test as test;
134134

135+
#[cfg(feature = "serde")]
135136
use super::*;
136137

137138
#[test]

0 commit comments

Comments
 (0)