Skip to content

Commit 4361460

Browse files
committed
remove feature flags
1 parent afeecc3 commit 4361460

File tree

11 files changed

+3
-26
lines changed

11 files changed

+3
-26
lines changed

rust/catalyst-voting/Cargo.toml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,10 @@ curve25519-dalek = { version = "4.1.3", features = ["digest", "rand_core"] }
2424
ed25519-dalek = { version = "2.1.1", features = ["rand_core"] }
2525
blake2b_simd = "1.0.2"
2626
rayon = "1.10.0"
27-
proptest = { version = "1.5.0", optional = true }
27+
proptest = { version = "1.5.0" }
2828

2929
[dev-dependencies]
3030
criterion = "0.5.1"
31-
proptest = { version = "1.5.0" }
3231
# Potentially it could be replaced with using `proptest::property_test` attribute macro,
3332
# after this PR will be merged https://github.com/proptest-rs/proptest/pull/523
3433
test-strategy = "0.4.0"
35-
36-
[features]
37-
# Feature which makes publicly available
38-
# `proptest::prelude::Arbitrary` trait implementation for some types
39-
proptest-arbitrary = ["dep:proptest"]

rust/catalyst-voting/src/crypto/ed25519/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ pub fn verify_signature(pk: &PublicKey, msg: &[u8], sig: &Signature) -> bool {
4646
pk.0.verify_strict(msg, &sig.0).is_ok()
4747
}
4848

49-
#[cfg(any(test, feature = "proptest-arbitrary"))]
5049
#[allow(missing_docs, clippy::missing_docs_in_private_items)]
5150
mod arbitrary_impl {
5251
use proptest::prelude::{any, Arbitrary, BoxedStrategy, Strategy};

rust/catalyst-voting/src/crypto/elgamal/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ impl Add<&Ciphertext> for &Ciphertext {
6666
}
6767
}
6868

69-
#[cfg(any(test, feature = "proptest-arbitrary"))]
7069
#[allow(missing_docs, clippy::missing_docs_in_private_items)]
7170
mod arbitrary_impl {
7271
use proptest::{

rust/catalyst-voting/src/crypto/group/ristretto255/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ impl Sub<&GroupElement> for &GroupElement {
159159
}
160160
}
161161

162-
#[cfg(any(test, feature = "proptest-arbitrary"))]
163162
#[allow(missing_docs, clippy::missing_docs_in_private_items)]
164163
mod arbitrary_impl {
165164
use proptest::{

rust/catalyst-voting/src/crypto/zk_unit_vector/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,6 @@ fn check_2(
235235
&right_1 + &right_2 == left
236236
}
237237

238-
#[cfg(any(test, feature = "proptest-arbitrary"))]
239238
#[allow(missing_docs, clippy::missing_docs_in_private_items)]
240239
mod arbitrary_impl {
241240
use proptest::{

rust/catalyst-voting/src/crypto/zk_unit_vector/randomness_announcements.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ impl ResponseRandomness {
7979
}
8080
}
8181

82-
#[cfg(any(test, feature = "proptest-arbitrary"))]
8382
#[allow(missing_docs, clippy::missing_docs_in_private_items)]
8483
mod arbitrary_impl {
8584
use proptest::{

rust/catalyst-voting/src/vote_protocol/committee/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ impl ElectionSecretKey {
3636
#[derive(Debug, Clone, PartialEq, Eq)]
3737
pub struct ElectionPublicKey(pub(crate) GroupElement);
3838

39-
#[cfg(any(test, feature = "proptest-arbitrary"))]
4039
#[allow(missing_docs, clippy::missing_docs_in_private_items)]
4140
mod arbitrary_impl {
4241
use proptest::prelude::{any, Arbitrary, BoxedStrategy, Strategy};

rust/catalyst-voting/src/vote_protocol/voter/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ pub fn decrypt_vote(vote: &EncryptedVote, secret_key: &ElectionSecretKey) -> any
141141
bail!("Invalid encrypted vote, not a valid unit vector.")
142142
}
143143

144-
#[cfg(any(test, feature = "proptest-arbitrary"))]
145144
#[allow(missing_docs, clippy::missing_docs_in_private_items)]
146145
mod arbitrary_impl {
147146
use proptest::{

rust/catalyst-voting/src/vote_protocol/voter/proof.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ pub fn verify_voter_proof(
107107
verify_unit_vector_proof(&proof.0, encrypted_vote.0, &public_key.0, &commitment.0)
108108
}
109109

110-
#[cfg(any(test, feature = "proptest-arbitrary"))]
111110
#[allow(missing_docs, clippy::missing_docs_in_private_items)]
112111
mod arbitrary_impl {
113112
use proptest::prelude::{any_with, Arbitrary, BoxedStrategy, Strategy};

rust/jormungandr-vote-tx/Cargo.toml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,11 @@ license.workspace = true
1111
workspace = true
1212

1313
[dependencies]
14-
catalyst-voting = { version = "0.0.1", path = "../catalyst-voting" }
14+
catalyst-voting = { version = "0.0.1", path = "../catalyst-voting" }
1515
anyhow = "1.0.89"
16-
proptest = { version = "1.5.0", optional = true }
16+
proptest = { version = "1.5.0" }
1717

1818
[dev-dependencies]
19-
catalyst-voting = { version = "0.0.1", path = "../catalyst-voting", features = ["proptest-arbitrary"] }
20-
21-
proptest = { version = "1.5.0" }
2219
# Potentially it could be replaced with using `proptest::property_test` attribute macro,
2320
# after this PR will be merged https://github.com/proptest-rs/proptest/pull/523
2421
test-strategy = "0.4.0"
25-
26-
[features]
27-
# Feature which makes publicly available
28-
# `proptest::prelude::Arbitrary` trait implementation for some types
29-
proptest-arbitrary = ["catalyst-voting/proptest-arbitrary", "dep:proptest"]

0 commit comments

Comments
 (0)