Merge pull request #17486 from MinaProtocol/cjjdespres/review-17339

Restructure merkle ledger tests, updated

Author: dannywillems

src/dune-project

@@ -78,7 +78,6 @@
 (package (name logproc_lib))
 (package (name merkle_address))
 (package (name merkle_ledger))
-(package (name merkle_ledger_tests))
 (package (name merkle_list_prover))
 (package (name merkle_list_verifier))
 (package (name merkle_mask))

src/lib/merkle_ledger_tests/binary_tree.ml renamed to src/lib/merkle_ledger/test/binary_tree.ml

@@ -1,11 +1,8 @@
 (library
  (name merkle_ledger_tests)
- (public_name merkle_ledger_tests)
- (library_flags -linkall)
- (flags
-  (:standard -warn-error +a)
-  -open
-  Core_kernel)
+ (public_name merkle_ledger.tests)
+ (modules (:standard \ test))
+ (flags (:standard -warn-error +a))
  (preprocess
   (pps
    ppx_version
@@ -14,23 +11,19 @@
    ppx_deriving.show
    ppx_deriving_yojson))
  (libraries
-  ; Opam
   alcotest
   async
   async_kernel
   async_unix
   base.base_internalhash_types
   base.caml
+  base58_check
   bin_prot.shape
+  codable
   core
   core.uuid
   core_kernel
   core_kernel.uuid
-  result
-  sexplib0
-  ; Mina
-  base58_check
-  codable
   currency
   data_hash_lib
   key_value_database
@@ -42,6 +35,26 @@
   mina_numbers
   mina_stdlib
   ppx_version.runtime
+  result
+  sexplib0
   signature_lib)
  (instrumentation
   (backend bisect_ppx)))
+
+(test
+ (name test)
+ (package merkle_ledger)
+ (modules test)
+ (flags (:standard -warn-error +a))
+ (preprocess
+  (pps
+   ppx_version
+   ppx_jane
+   ppx_compare
+   ppx_deriving.show
+   ppx_deriving_yojson))
+ (libraries
+  alcotest
+  merkle_ledger_tests)
+ (instrumentation
+  (backend bisect_ppx)))

src/lib/merkle_ledger_tests/dune renamed to src/lib/merkle_ledger/test/dune

@@ -0,0 +1,16 @@
+(* Testing
+   -------
+
+   Component: Merkle ledger tests
+   Subject: Run all Merkle ledger tests
+   Invocation: dune exec src/lib/merkle_ledger/test/test.exe
+*)
+
+open Merkle_ledger_tests
+
+let () =
+  let tests =
+    Test_database_in_mem.tests @ Test_database_integration.tests
+    @ Test_mask.tests @ Test_converting.tests
+  in
+  Alcotest.run "Merkle ledger" tests

src/lib/merkle_ledger/test/test.ml

@@ -54,12 +54,12 @@ module Migrated = struct
 end
 
 module Inputs_migrated =
-  Test_database.Make_inputs (Migrated.Account) (Migrated.Hash)
+  Test_database_in_mem.Make_inputs (Migrated.Account) (Migrated.Hash)
 
 module type DB_migrated =
-  Test_database.Account_Db with type account := Migrated.Account.t
+  Test_database_in_mem.Account_Db with type account := Migrated.Account.t
 
-module Db = Database.Make (Test_database.Inputs)
+module Db = Database.Make (Test_database_in_mem.Inputs)
 module Db_migrated = Database.Make (Inputs_migrated)
 
 module Db_converting =
@@ -82,7 +82,7 @@ module Db_converting =
         ; unstable_field = account.nonce
         }
 
-      include Test_database.Inputs
+      include Test_database_in_mem.Inputs
     end)
     (Db)
     (Db_migrated)

src/lib/merkle_ledger_tests/test_converting.ml renamed to src/lib/merkle_ledger/test/test_converting.ml

@@ -4,7 +4,7 @@
    Component: In memory database
    Subject: Merkle ledger tests for in-memory database
    Invocation: \
-     dune exec src/lib/merkle_ledger_tests/main.exe -- test "In-memory db"
+     dune exec src/lib/merkle_ledger/test/test.exe -- test "In-memory db"
 *)
 
 open Core

src/lib/merkle_ledger_tests/test_database.ml renamed to src/lib/merkle_ledger/test/test_database_in_mem.ml

@@ -3,7 +3,8 @@
 
    Component: Merkle ledger
    Subject: Database integration testing
-   Invocation: dune exec src/lib/merkle_ledger_tests/main.exe -- test "Databases"
+   Invocation: \
+     dune exec src/lib/merkle_ledger/test/test.exe -- test "Databases"
 *)
 
 open Core

src/lib/merkle_ledger_tests/test.ml renamed to src/lib/merkle_ledger/test/test_database_integration.ml

@@ -4,7 +4,7 @@
    Component: Merkle masks
    Subject: Test Merkle mask connected to underlying Merkle tree
    Invocation: \
-      dune exec src/lib/merkle_ledger_tests/main.exe -- \
+      dune exec src/lib/merkle_ledger/test/test.exe -- \
       test "Mask with underlying Merkle tree"
 *)