begin migration from quickcheck -> proptest in chain-impl-mockchain (#775)

* begin migration from quickcheck -> proptest

* all working except strange imhamt bug

* a few more tests, needs evm migration

* workaround for hamt issue

* fmt and clippy

* merge conflict

* couple of merge conflicts

* fmt again

* increase proptest shrink iters

* fix arbitrary impls so tests pass

* compile error

* compile error

* fmt

* remove old failure seed

* merge proptest impl modules into test modules

* some fixes for upstream proptest impls

* fix compile errors from master merge

* fix imports

* fix compile errors

Author: cameron1024

.github/workflows/main.yml

@@ -82,6 +82,7 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     timeout-minutes: 120
     env:
+      PROPTEST_MAX_SHRINK_ITERS: 10000
       CARGO_INCREMENTAL: 0
     steps:
       - uses: actions/checkout@v2

chain-crypto/src/algorithms/ed25519.rs

@@ -6,15 +6,31 @@ use cryptoxide::ed25519;
 use rand_core::{CryptoRng, RngCore};
 
 /// ED25519 Signing Algorithm
+#[cfg_attr(
+    any(test, feature = "property-test-api"),
+    derive(test_strategy::Arbitrary, Debug)
+)]
 pub struct Ed25519;
 
 #[derive(Clone)]
+#[cfg_attr(
+    any(test, feature = "property-test-api"),
+    derive(test_strategy::Arbitrary, Debug)
+)]
 pub struct Priv([u8; ed25519::PRIVATE_KEY_LENGTH]);
 
 #[derive(Clone, PartialEq, Eq, Hash)]
+#[cfg_attr(
+    any(test, feature = "property-test-api"),
+    derive(test_strategy::Arbitrary, Debug)
+)]
 pub struct Pub(pub(crate) [u8; ed25519::PUBLIC_KEY_LENGTH]);
 
 #[derive(Clone)]
+#[cfg_attr(
+    any(test, feature = "property-test-api"),
+    derive(test_strategy::Arbitrary, Debug)
+)]
 pub struct Sig(pub(crate) [u8; ed25519::SIGNATURE_LENGTH]);
 
 impl AsRef<[u8]> for Priv {

chain-crypto/src/algorithms/sumed25519/mod.rs

@@ -21,6 +21,10 @@ use rand_core::{CryptoRng, RngCore};
 
 // MMM sum scheme instanciated over the Ed25519 signature system
 // and a specific depth of 12
+#[cfg_attr(
+    any(test, feature = "property-test-api"),
+    derive(test_strategy::Arbitrary, Debug)
+)]
 pub struct SumEd25519_12;
 
 const DEPTH: common::Depth = common::Depth(12);

chain-crypto/src/algorithms/sumed25519/sum.rs

@@ -389,6 +389,10 @@ impl SecretKey {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[cfg_attr(
+    any(test, feature = "property-test-api"),
+    derive(test_strategy::Arbitrary)
+)]
 pub struct PublicKey([u8; PUBLIC_KEY_SIZE]);
 
 impl PublicKey {

chain-crypto/src/algorithms/vrf/mod.rs

@@ -10,6 +10,10 @@ use rand_core::{CryptoRng, RngCore};
 pub use vrf::ProvenOutputSeed;
 
 /// VRF
+#[cfg_attr(
+    any(test, feature = "property-test-api"),
+    derive(test_strategy::Arbitrary, Debug)
+)]
 pub struct RistrettoGroup2HashDh;
 
 impl AsymmetricPublicKey for RistrettoGroup2HashDh {

chain-crypto/src/algorithms/vrf/vrf.rs

@@ -26,6 +26,10 @@ impl AsRef<[u8]> for SecretKey {
 
 /// VRF Public Key
 #[derive(Debug, Clone, PartialEq, Eq)]
+#[cfg_attr(
+    any(test, feature = "property-test-api"),
+    derive(test_strategy::Arbitrary)
+)]
 pub struct PublicKey(GroupElement, [u8; Self::BYTES_LEN]);
 
 #[allow(clippy::derive_hash_xor_eq)]

chain-crypto/src/digest.rs

@@ -136,6 +136,10 @@ impl<H: DigestAlg> Context<H> {
     }
 }
 
+#[cfg_attr(
+    any(test, feature = "property-test-api"),
+    derive(test_strategy::Arbitrary)
+)]
 pub struct Digest<H: DigestAlg>(H::DigestData);
 
 impl<H: DigestAlg> Clone for Digest<H> {
@@ -264,6 +268,10 @@ impl<H: DigestAlg> Digest<H> {
 use std::marker::PhantomData;
 
 /// A typed version of Digest
+#[cfg_attr(
+    any(test, feature = "property-test-api"),
+    derive(test_strategy::Arbitrary)
+)]
 pub struct DigestOf<H: DigestAlg, T> {
     inner: Digest<H>,
     marker: PhantomData<T>,

chain-crypto/src/ec/ristretto255.rs

@@ -8,6 +8,8 @@ use curve25519_dalek_ng::{
 use cryptoxide::blake2b::Blake2b;
 use cryptoxide::digest::Digest;
 
+#[cfg(any(test, feature = "property-test-api"))]
+use proptest::strategy::{BoxedStrategy, Strategy};
 use rand_core::{CryptoRng, RngCore};
 use std::hash::{Hash, Hasher};
 use std::ops::{Add, Mul, Sub};
@@ -21,6 +23,18 @@ pub struct Scalar(IScalar);
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct GroupElement(Point);
 
+#[cfg(any(test, feature = "property-test-api"))]
+impl proptest::arbitrary::Arbitrary for GroupElement {
+    type Parameters = ();
+    type Strategy = BoxedStrategy<Self>;
+
+    fn arbitrary_with((): ()) -> Self::Strategy {
+        proptest::arbitrary::any::<[u8; 64]>()
+            .prop_map(|bytes| GroupElement(Point::from_uniform_bytes(&bytes)))
+            .boxed()
+    }
+}
+
 #[allow(clippy::derive_hash_xor_eq)]
 impl Hash for GroupElement {
     fn hash<H: Hasher>(&self, state: &mut H) {

chain-crypto/src/hash.rs

@@ -136,6 +136,11 @@ pub const HASH_SIZE_256: usize = 32;
 
 /// Blake2b 256 bits
 #[derive(PartialEq, Eq, PartialOrd, Ord, Copy, Clone, Hash)]
+#[cfg_attr(
+    any(test, feature = "property-test-api"),
+    derive(test_strategy::Arbitrary)
+)]
 pub struct Blake2b256([u8; HASH_SIZE_256]);
+
 define_hash_object!(Blake2b256, Blake2b256, HASH_SIZE_256, "blake2b256");
 define_blake2b_new!(Blake2b256);

chain-crypto/src/key.rs

@@ -1,5 +1,7 @@
 use crate::bech32::{self, Bech32};
 use hex::FromHexError;
+#[cfg(any(test, feature = "property-test-api"))]
+use proptest::strategy::{BoxedStrategy, Strategy};
 use rand_core::{CryptoRng, RngCore};
 use std::fmt;
 use std::hash::Hash;
@@ -52,8 +54,19 @@ pub trait SecretKeySizeStatic: AsymmetricKey {
 
 pub struct SecretKey<A: AsymmetricKey>(pub(crate) A::Secret);
 
+#[cfg(any(test, feature = "property-test-api"))]
+impl<A: AsymmetricPublicKey + 'static> proptest::arbitrary::Arbitrary for PublicKey<A>
+where
+    A::Public: proptest::arbitrary::Arbitrary,
+{
+    type Parameters = ();
+    type Strategy = BoxedStrategy<Self>;
+    fn arbitrary_with((): ()) -> Self::Strategy {
+        let x = proptest::arbitrary::any::<A::Public>();
+        x.prop_map(|x| Self(x)).boxed()
+    }
+}
 pub struct PublicKey<A: AsymmetricPublicKey>(pub(crate) A::Public);
-
 pub struct KeyPair<A: AsymmetricKey>(SecretKey<A>, PublicKey<A::PubAlg>);
 
 impl<A: AsymmetricKey> KeyPair<A> {

chain-impl-mockchain/Cargo.toml

@@ -22,6 +22,8 @@ strum_macros = "0.23.1"
 hex = { version = "0.4.2", default-features = false, features = [ "std" ] }
 quickcheck = { version = "0.9", optional = true }
 quickcheck_macros = { version = "0.9", optional = true }
+proptest = { git = "https://github.com/input-output-hk/proptest.git", optional = true }
+test-strategy = { version = "0.1", optional = true }
 ed25519-bip32 = { version = "0.4.1", optional = true }
 thiserror = "1.0"
 lazy_static = { version = "1.3.0", optional = true }
@@ -37,17 +39,22 @@ property-test-api = [
         "chain-time/property-test-api",
         "chain-addr/property-test-api",
         "chain-evm/property-test-api",
+        "imhamt/property-test-api",
         "quickcheck",
         "quickcheck_macros",
+        "proptest",
+        "test-strategy",
         "lazy_static",
         "rand_chacha",
         "ed25519-bip32"]
 with-bench = ["criterion","property-test-api"]
-evm = ["chain-evm"]
+evm = ["chain-evm", "proptest/evm"]
 
 [dev-dependencies]
 quickcheck = "0.9"
 quickcheck_macros = "0.9"
+proptest = { git = "https://github.com/input-output-hk/proptest.git" }
+test-strategy = "0.1"
 chain-core = { path = "../chain-core"}
 chain-crypto = { path = "../chain-crypto", features=["property-test-api"]}
 chain-time = { path = "../chain-time", features=["property-test-api"]}

chain-impl-mockchain/src/account.rs

@@ -16,6 +16,10 @@ pub type Witness = Signature<WitnessAccountData, AccountAlg>;
 
 /// Account Identifier (also used as Public Key)
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[cfg_attr(
+    any(test, feature = "property-test-api"),
+    derive(test_strategy::Arbitrary)
+)]
 pub struct Identifier(PublicKey<AccountAlg>);
 
 impl From<PublicKey<AccountAlg>> for Identifier {