move chain-test-utils to chain-impl-mockchain

These methods are not used elsewhere so now:

- They are moved to chain-impl-mockchain.
- chain-test-utils is removed.

Cargo.toml

@@ -9,7 +9,6 @@ members = [
     "chain-crypto",
     "chain-network",
     "chain-storage",
-    "chain-test-utils",
     "chain-impl-mockchain",
     "cardano-legacy-address",
     "sparse-array",

chain-impl-mockchain/Cargo.toml

@@ -26,7 +26,6 @@ thiserror = "1.0"
 lazy_static = { version = "1.3.0", optional = true }
 cardano-legacy-address = { path= "../cardano-legacy-address" }
 rand_chacha = { version = "0.3", optional = true }
-chain-test-utils = { path = "../chain-test-utils", optional = true }
 rayon = "1.5.0"
 criterion = { version = "0.3.0", optional = true }
 rand = "0.8"
@@ -36,7 +35,6 @@ property-test-api = [
         "chain-crypto/property-test-api",
         "chain-time/property-test-api",
         "chain-addr/property-test-api",
-        "chain-test-utils",
         "quickcheck",
         "quickcheck_macros",
         "lazy_static",
@@ -48,7 +46,6 @@ with-bench = ["criterion","property-test-api"]
 quickcheck = "0.9"
 quickcheck_macros = "0.9"
 chain-core = { path = "../chain-core"}
-chain-test-utils = { path = "../chain-test-utils" }
 chain-crypto = { path = "../chain-crypto", features=["property-test-api"]}
 chain-time = { path = "../chain-time", features=["property-test-api"]}
 chain-addr = { path = "../chain-addr", features=["property-test-api"]}

chain-impl-mockchain/src/block/test.rs

@@ -2,6 +2,8 @@
 use crate::block::Header;
 #[cfg(test)]
 use crate::header::HeaderDesc;
+#[cfg(test)]
+use crate::testing::serialization::{serialization_bijection, serialization_bijection_r};
 use crate::{
     block::{Block, BlockVersion, HeaderRaw},
     fragment::{Contents, ContentsBuilder, Fragment},
@@ -10,26 +12,24 @@ use crate::{
 #[cfg(test)]
 use chain_core::property::{Block as _, Deserialize, HasHeader as _, Serialize};
 #[cfg(test)]
-use chain_test_utils::property;
-#[cfg(test)]
 use quickcheck::TestResult;
 use quickcheck::{Arbitrary, Gen};
 
 quickcheck! {
     fn headerraw_serialization_bijection(b: HeaderRaw) -> TestResult {
-        property::serialization_bijection(b)
+        serialization_bijection(b)
     }
 
     fn header_serialization_bijection(b: Header) -> TestResult {
-        property::serialization_bijection_r(b)
+        serialization_bijection_r(b)
     }
 
     fn block_serialization_bijection(b: Block) -> TestResult {
-        property::serialization_bijection(b)
+        serialization_bijection(b)
     }
 
     fn block_serialization_bijection_r(b: Block) -> TestResult {
-        property::serialization_bijection_r(b)
+        serialization_bijection_r(b)
     }
 
     fn block_properties(block: Block) -> TestResult {

chain-impl-mockchain/src/fragment/test.rs

@@ -1,6 +1,8 @@
 use super::*;
 use crate::config::ConfigParam;
 #[cfg(test)]
+use crate::testing::serialization::serialization_bijection_r;
+#[cfg(test)]
 use quickcheck::TestResult;
 use quickcheck::{Arbitrary, Gen};
 use quickcheck_macros::quickcheck;
@@ -35,7 +37,7 @@ fn fragment_serialization_bijection(b: Fragment) -> TestResult {
 
 quickcheck! {
     fn initial_ents_serialization_bijection(config_params: ConfigParams) -> TestResult {
-        chain_test_utils::property::serialization_bijection_r(config_params)
+        serialization_bijection_r(config_params)
     }
 }
 

chain-impl-mockchain/src/header/test.rs

@@ -2,6 +2,8 @@ use super::*;
 use crate::chaintypes::ChainLength;
 use crate::header::{BftProof, BftSignature, Common, GenesisPraosProof, KesSignature};
 use crate::key::BftLeaderId;
+#[cfg(test)]
+use crate::testing::serialization::serialization_bijection_r;
 use chain_crypto::{
     self, AsymmetricKey, Ed25519, RistrettoGroup2HashDh, SecretKey, SumEd25519_12,
     VerifiableRandomFunction,
@@ -13,7 +15,7 @@ use quickcheck::{Arbitrary, Gen};
 
 quickcheck! {
     fn header_serialization_bijection(b: Header) -> TestResult {
-        chain_test_utils::property::serialization_bijection_r(b)
+        serialization_bijection_r(b)
     }
 }
 

chain-impl-mockchain/src/key.rs

@@ -404,9 +404,9 @@ impl Readable for GenesisPraosLeader {
 #[cfg(any(test, feature = "property-test-api"))]
 mod tests {
     use super::*;
-    use chain_crypto::{testing, PublicKey, RistrettoGroup2HashDh, SecretKey, SumEd25519_12};
     #[cfg(test)]
-    use chain_test_utils::property::serialization_bijection;
+    use crate::testing::serialization::serialization_bijection;
+    use chain_crypto::{testing, PublicKey, RistrettoGroup2HashDh, SecretKey, SumEd25519_12};
     use lazy_static::lazy_static;
     #[cfg(test)]
     use quickcheck::TestResult;

chain-impl-mockchain/src/testing/mod.rs

@@ -12,3 +12,4 @@ pub use builders::*;
 pub use data::KeysDb;
 pub use gen::{TestGen, VoteTestGen};
 pub use ledger::{ConfigBuilder, LedgerBuilder, TestLedger, UtxoDb};
+pub mod serialization;

chain-impl-mockchain/src/transaction/test.rs

@@ -5,6 +5,8 @@ use super::{
 #[cfg(test)]
 use crate::certificate::OwnerStakeDelegation;
 use crate::key::{EitherEd25519SecretKey, SpendingSignature};
+#[cfg(test)]
+use crate::testing::serialization::serialization_bijection_r;
 use chain_crypto::{testing::arbitrary_secret_key, Ed25519, SecretKey, Signature};
 #[cfg(test)]
 use quickcheck::TestResult;
@@ -13,18 +15,18 @@ use quickcheck_macros::quickcheck;
 
 quickcheck! {
     fn transaction_encode_decode(transaction: Transaction<NoExtra>) -> TestResult {
-        chain_test_utils::property::serialization_bijection_r(transaction)
+        serialization_bijection_r(transaction)
     }
     fn stake_owner_delegation_tx_encode_decode(transaction: Transaction<OwnerStakeDelegation>) -> TestResult {
-        chain_test_utils::property::serialization_bijection_r(transaction)
+        serialization_bijection_r(transaction)
     }
     /*
     fn certificate_tx_encode_decode(transaction: Transaction<Address, Certificate>) -> TestResult {
         chain_core::property::testing::serialization_bijection_r(transaction)
     }
     */
     fn signed_transaction_encode_decode(transaction: Transaction<NoExtra>) -> TestResult {
-        chain_test_utils::property::serialization_bijection_r(transaction)
+        serialization_bijection_r(transaction)
     }
 }
 

chain-impl-mockchain/src/update.rs

@@ -396,6 +396,8 @@ impl Readable for SignedUpdateVote {
 mod tests {
     use super::*;
     #[cfg(test)]
+    use crate::testing::serialization::serialization_bijection;
+    #[cfg(test)]
     use crate::{
         config::ConfigParam,
         testing::{
@@ -414,8 +416,6 @@ mod tests {
     #[cfg(test)]
     use chain_addr::Discrimination;
     #[cfg(test)]
-    use chain_test_utils::property::serialization_bijection;
-    #[cfg(test)]
     use quickcheck::TestResult;
     use quickcheck::{Arbitrary, Gen};
     use quickcheck_macros::quickcheck;