enable proptest with arbitrary feature (#323)

bluealloy · Jan 9, 2023 · 81942d6 · 81942d6
1 parent 2be3798
commit 81942d6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/interpreter/Cargo.toml b/crates/interpreter/Cargo.toml
@@ -33,11 +33,13 @@ sha3 = { version = "0.10", default-features = false, features = [] }
 # optional
 serde = { version = "1.0", features = ["derive", "rc"], optional = true }
 arbitrary = { version = "1.2", features = ["derive"], optional = true }
+proptest = { version = "1.0", optional = true }
+proptest-derive = { version = "0.3", optional = true }
 
 [dev-dependencies]
 arbitrary = { version = "1.2", features = ["derive"] }
 proptest = { version = "1.0" }
-proptest-derive = "0.2.0"
+proptest-derive = "0.3"
 ruint = { version = "1.7.0", features = [
     "primitive-types",
     "rlp",
@@ -68,4 +70,10 @@ serde = [
     "ruint/serde",
     "bytes/serde",
 ]
-arbitrary = ["dep:arbitrary", "ruint/arbitrary", "ruint/proptest"]
+arbitrary = [
+    "ruint/arbitrary",
+    "ruint/proptest",
+    "dep:arbitrary",
+    "dep:proptest",
+    "dep:proptest-derive"
+]
diff --git a/crates/interpreter/src/bits.rs b/crates/interpreter/src/bits.rs
@@ -1,24 +1,21 @@
 use derive_more::{AsRef, Deref};
 use fixed_hash::{construct_fixed_hash, impl_fixed_hash_conversions};
 
-#[cfg(test)]
-use proptest_derive::Arbitrary as PropTestArbitrary;
-
 #[cfg(any(test, feature = "arbitrary"))]
 use arbitrary::Arbitrary;
+#[cfg(any(test, feature = "arbitrary"))]
+use proptest_derive::Arbitrary as PropTestArbitrary;
 
 construct_fixed_hash! {
     /// revm 256 bits type.
-    #[cfg_attr(test, derive(PropTestArbitrary))]
-    #[cfg_attr(any(test, feature = "arbitrary"), derive(Arbitrary))]
+    #[cfg_attr(any(test, feature = "arbitrary"), derive(Arbitrary, PropTestArbitrary))]
     #[derive(AsRef,Deref)]
     pub struct B256(32);
 }
 
 construct_fixed_hash! {
     /// revm 160 bits type.
-    #[cfg_attr(test, derive(PropTestArbitrary))]
-    #[cfg_attr(any(test, feature = "arbitrary"), derive(Arbitrary))]
+    #[cfg_attr(any(test, feature = "arbitrary"), derive(Arbitrary, PropTestArbitrary))]
     #[derive(AsRef,Deref)]
     pub struct B160(20);
 }