make compile-time test accounts lazy (#4186)

deepthiskumar · web-flow · commit 79a007b2d82e · 2020-02-06T19:17:21.000Z
* make test account lazy

* turning top level constants that uses test ledger to functions

* turning top level constants that uses test ledger to functions
diff --git a/src/app/cli/src/tests/coda_batch_payment_test.ml b/src/app/cli/src/tests/coda_batch_payment_test.ml
@@ -9,7 +9,8 @@ let main () =
   Async.Scheduler.set_record_backtraces true ;
   let logger = Logger.create () in
   let keypairs =
-    List.map Test_genesis_ledger.accounts
+    List.map
+      (Lazy.force Test_genesis_ledger.accounts)
       ~f:Test_genesis_ledger.keypair_of_account_record_exn
   in
   let largest_account_keypair =
diff --git a/src/app/cli/src/tests/coda_change_snark_worker_test.ml b/src/app/cli/src/tests/coda_change_snark_worker_test.ml
@@ -67,7 +67,8 @@ let main () =
     wait_for_snark_worker_proof new_block_pipe1 largest_public_key
   in
   let new_snark_worker =
-    List.find_map_exn Test_genesis_ledger.accounts ~f:(fun (_, account) ->
+    List.find_map_exn (Lazy.force Test_genesis_ledger.accounts)
+      ~f:(fun (_, account) ->
         let public_key = Account.public_key account in
         Option.some_if
           (not @@ Public_key.Compressed.equal largest_public_key public_key)
diff --git a/src/app/cli/src/tests/coda_delegation_test.ml b/src/app/cli/src/tests/coda_delegation_test.ml
@@ -10,8 +10,9 @@ include Heartbeat.Make ()
 let main () =
   let logger = Logger.create () in
   let num_block_producers = 3 in
+  let accounts = Lazy.force Test_genesis_ledger.accounts in
   let snark_work_public_keys ndx =
-    List.nth_exn Test_genesis_ledger.accounts ndx
+    List.nth_exn accounts ndx
     |> fun (_, acct) -> Some (Account.public_key acct)
   in
   let%bind testnet =
@@ -23,7 +24,7 @@ let main () =
   (* keep CI alive *)
   Deferred.don't_wait_for (print_heartbeat logger) ;
   (* dump account info to log *)
-  List.iteri Test_genesis_ledger.accounts ~f:(fun ndx ((_, acct) as record) ->
+  List.iteri accounts ~f:(fun ndx ((_, acct) as record) ->
       let keypair = Test_genesis_ledger.keypair_of_account_record_exn record in
       Logger.info logger ~module_:__MODULE__ ~location:__LOC__
         "Account: $account_number"
@@ -38,15 +39,13 @@ let main () =
                 @@ Account.public_key acct ) )
           ; ("balance", `Int (Currency.Balance.to_int acct.balance)) ] ) ;
   (* second account is delegator; see genesis_ledger/test_delegation_ledger.ml *)
-  let ((_, delegator_account) as delegator) =
-    List.nth_exn Test_genesis_ledger.accounts 2
-  in
+  let ((_, delegator_account) as delegator) = List.nth_exn accounts 2 in
   let delegator_pubkey = Account.public_key delegator_account in
   let delegator_keypair =
     Test_genesis_ledger.keypair_of_account_record_exn delegator
   in
   (* zeroth account is delegatee *)
-  let _, delegatee_account = List.nth_exn Test_genesis_ledger.accounts 0 in
+  let _, delegatee_account = List.nth_exn accounts 0 in
   let delegatee_pubkey = Account.public_key delegatee_account in
   let worker = testnet.workers.(0) in
   (* setup readers for produced blocks by delegator, delegatee *)
diff --git a/src/app/cli/src/tests/coda_five_nodes_test.ml b/src/app/cli/src/tests/coda_five_nodes_test.ml
@@ -10,7 +10,7 @@ let main () =
   let snark_work_public_keys = function
     | 0 ->
         Some
-          ( List.nth_exn Test_genesis_ledger.accounts 5
+          ( List.nth_exn (Lazy.force Test_genesis_ledger.accounts) 5
           |> snd |> Account.public_key )
     | _ ->
         None
diff --git a/src/app/cli/src/tests/coda_long_fork.ml b/src/app/cli/src/tests/coda_long_fork.ml
@@ -6,7 +6,8 @@ let name = "coda-long-fork"
 let main n waiting_time () =
   let logger = Logger.create () in
   let keypairs =
-    List.map Test_genesis_ledger.accounts
+    List.map
+      (Lazy.force Test_genesis_ledger.accounts)
       ~f:Test_genesis_ledger.keypair_of_account_record_exn
   in
   let snark_work_public_keys i =
diff --git a/src/app/cli/src/tests/coda_restarts_and_txns_holy_grail.ml b/src/app/cli/src/tests/coda_restarts_and_txns_holy_grail.ml
@@ -8,11 +8,9 @@ let main n () =
   let wait_time = Time.Span.of_min 2. in
   assert (n > 1) ;
   let logger = Logger.create () in
+  let accounts = Lazy.force Test_genesis_ledger.accounts in
   let snark_work_public_keys =
-    Fn.const
-    @@ Some
-         ( List.nth_exn Test_genesis_ledger.accounts 5
-         |> snd |> Account.public_key )
+    Fn.const @@ Some (List.nth_exn accounts 5 |> snd |> Account.public_key)
   in
   let block_production_keys n = if n < 3 then Some n else None in
   let%bind testnet =
@@ -22,8 +20,7 @@ let main n () =
   in
   (* SEND TXNS *)
   let keypairs =
-    List.map Test_genesis_ledger.accounts
-      ~f:Test_genesis_ledger.keypair_of_account_record_exn
+    List.map accounts ~f:Test_genesis_ledger.keypair_of_account_record_exn
   in
   let random_block_producer () = Random.int 2 + 1 in
   let random_non_block_producer () = Random.int 2 + 3 in
diff --git a/src/app/cli/src/tests/coda_shared_prefix_multiproducer_test.ml b/src/app/cli/src/tests/coda_shared_prefix_multiproducer_test.ml
@@ -7,7 +7,8 @@ let name = "coda-shared-prefix-multiproducer-test"
 let main n enable_payments () =
   let logger = Logger.create () in
   let keypairs =
-    List.map Test_genesis_ledger.accounts
+    List.map
+      (Lazy.force Test_genesis_ledger.accounts)
       ~f:Test_genesis_ledger.keypair_of_account_record_exn
   in
   let snark_work_public_keys i =
diff --git a/src/app/cli/src/tests/coda_shared_state_test.ml b/src/app/cli/src/tests/coda_shared_state_test.ml
@@ -8,7 +8,8 @@ let main () =
   let logger = Logger.create () in
   let n = 2 in
   let keypairs =
-    List.map Test_genesis_ledger.accounts
+    List.map
+      (Lazy.force Test_genesis_ledger.accounts)
       ~f:Test_genesis_ledger.keypair_of_account_record_exn
   in
   let snark_work_public_keys i =
diff --git a/src/app/cli/src/tests/coda_txns_and_restart_non_producers.ml b/src/app/cli/src/tests/coda_txns_and_restart_non_producers.ml
@@ -7,11 +7,9 @@ let name = "coda-txns-and-restart-non-producers"
 let main () =
   let wait_time = Time.Span.of_min 2. in
   let logger = Logger.create () in
+  let accounts = Lazy.force Test_genesis_ledger.accounts in
   let snark_work_public_keys =
-    Fn.const
-    @@ Some
-         ( List.nth_exn Test_genesis_ledger.accounts 5
-         |> snd |> Account.public_key )
+    Fn.const @@ Some (List.nth_exn accounts 5 |> snd |> Account.public_key)
   in
   let producers n = if n < 3 then Some n else None in
   let%bind testnet =
@@ -21,8 +19,7 @@ let main () =
   in
   (* send txns *)
   let keypairs =
-    List.map Test_genesis_ledger.accounts
-      ~f:Test_genesis_ledger.keypair_of_account_record_exn
+    List.map accounts ~f:Test_genesis_ledger.keypair_of_account_record_exn
   in
   let%bind () = after wait_time in
   Coda_worker_testnet.Payments.send_several_payments testnet ~node:0 ~keypairs
diff --git a/src/app/cli/src/tests/coda_worker.ml b/src/app/cli/src/tests/coda_worker.ml
@@ -463,7 +463,7 @@ module T = struct
           in
           let block_production_keypair =
             Option.map block_production_key ~f:(fun i ->
-                List.nth_exn Test_genesis_ledger.accounts i
+                List.nth_exn (Lazy.force Test_genesis_ledger.accounts) i
                 |> Test_genesis_ledger.keypair_of_account_record_exn )
           in
           let initial_block_production_keypairs =
diff --git a/src/app/cli/src/tests/full_test.ml b/src/app/cli/src/tests/full_test.ml
@@ -210,7 +210,8 @@ let run_test () : unit Deferred.t =
              ~consensus_local_state ~transaction_database
              ~external_transition_database ~work_reassignment_wait:420000
              ~genesis_state_hash:
-               Coda_state.Genesis_protocol_state.For_tests.genesis_state_hash
+               (Coda_state.Genesis_protocol_state.For_tests.genesis_state_hash
+                  ())
              ())
           ~genesis_ledger:Test_genesis_ledger.t
           ~base_proof:Precomputed_values.base_proof
@@ -426,7 +427,8 @@ let run_test () : unit Deferred.t =
         Test_genesis_ledger.keypair_of_account_record_exn sender
       in
       let other_accounts =
-        List.filter Test_genesis_ledger.accounts ~f:(fun (_, account) ->
+        List.filter (Lazy.force Test_genesis_ledger.accounts)
+          ~f:(fun (_, account) ->
             let reserved_public_keys =
               [ largest_account_keypair.public_key
               ; receiver_keypair.public_key
diff --git a/src/app/runtime_genesis_ledger/runtime_genesis_ledger.ml b/src/app/runtime_genesis_ledger/runtime_genesis_ledger.ml
@@ -66,7 +66,7 @@ let generate_base_proof ~ledger =
   (base_hash, base_proof)
 
 let compiled_accounts_json () : Account_config.t =
-  List.map Test_genesis_ledger.accounts ~f:(fun (sk_opt, acc) ->
+  List.map (Lazy.force Test_genesis_ledger.accounts) ~f:(fun (sk_opt, acc) ->
       { Account_config.pk= acc.public_key
       ; sk= sk_opt
       ; balance= acc.balance
diff --git a/src/lib/bootstrap_controller/bootstrap_controller.ml b/src/lib/bootstrap_controller/bootstrap_controller.ml
@@ -452,7 +452,9 @@ let%test_module "Bootstrap_controller tests" =
         in
         let%map make_branch =
           Transition_frontier.Breadcrumb.For_tests.gen_seq
-            ~accounts_with_secret_keys:Test_genesis_ledger.accounts branch_size
+            ~accounts_with_secret_keys:
+              (Lazy.force Test_genesis_ledger.accounts)
+            branch_size
         in
         let [me; _] = fake_network.peer_networks in
         let branch =
diff --git a/src/lib/coda_state/genesis_protocol_state.ml b/src/lib/coda_state/genesis_protocol_state.ml
@@ -48,10 +48,10 @@ let t ~genesis_ledger =
   in
   With_hash.of_data ~hash_data:Protocol_state.hash state
 
-let compile_time_genesis = t ~genesis_ledger:Test_genesis_ledger.t
+let compile_time_genesis () = t ~genesis_ledger:Test_genesis_ledger.t
 
 module For_tests = struct
   (*Use test_ledger generated at compile time*)
-  let genesis_state_hash =
+  let genesis_state_hash () =
     t ~genesis_ledger:Test_genesis_ledger.t |> With_hash.hash
 end
diff --git a/src/lib/coda_state/genesis_protocol_state.mli b/src/lib/coda_state/genesis_protocol_state.mli
@@ -9,8 +9,9 @@ val t :
      genesis_ledger:Ledger.t Lazy.t
   -> (Protocol_state.Value.t, State_hash.t) With_hash.t
 
-val compile_time_genesis : (Protocol_state.Value.t, State_hash.t) With_hash.t
+val compile_time_genesis :
+  unit -> (Protocol_state.Value.t, State_hash.t) With_hash.t
 
 module For_tests : sig
-  val genesis_state_hash : State_hash.t
+  val genesis_state_hash : unit -> State_hash.t
 end
diff --git a/src/lib/lite_precomputed_values/gen/gen.ml b/src/lib/lite_precomputed_values/gen/gen.ml
@@ -81,7 +81,8 @@ let genesis ~loc =
   end) in
   let open E in
   let protocol_state =
-    protocol_state Genesis_protocol_state.compile_time_genesis.data
+    let c = Genesis_protocol_state.compile_time_genesis () in
+    protocol_state c.data
   in
   let ledger =
     Sparse_ledger_lib.Sparse_ledger.of_hash ~depth:0
diff --git a/src/lib/precomputed_values/gen_values/gen_values.ml b/src/lib/precomputed_values/gen_values/gen_values.ml
@@ -37,8 +37,9 @@ end
 module Make_real (Keys : Keys_lib.Keys.S) = struct
   let loc = Ppxlib.Location.none
 
-  let base_hash =
-    Keys.Step.instance_hash Genesis_protocol_state.compile_time_genesis.data
+  let protocol_state_with_hash = Genesis_protocol_state.compile_time_genesis ()
+
+  let base_hash = Keys.Step.instance_hash protocol_state_with_hash.data
 
   let base_hash_expr =
     [%expr
@@ -66,7 +67,7 @@ module Make_real (Keys : Keys_lib.Keys.S) = struct
       ; wrap_vk= Tock.Keypair.vk Keys.Wrap.keys
       ; prev_state=
           Protocol_state.negative_one ~genesis_ledger:Test_genesis_ledger.t
-      ; genesis_state_hash= Genesis_protocol_state.compile_time_genesis.hash
+      ; genesis_state_hash= protocol_state_with_hash.hash
       ; expected_next_state= None
       ; update= Snark_transition.genesis ~genesis_ledger:Test_genesis_ledger.t
       }
diff --git a/src/lib/test_genesis_ledger/dummy_ledger.ml b/src/lib/test_genesis_ledger/dummy_ledger.ml
diff --git a/src/lib/test_genesis_ledger/functor.ml b/src/lib/test_genesis_ledger/functor.ml
@@ -8,22 +8,23 @@ let pk = Public_key.Compressed.of_base58_check_exn
 let sk = Private_key.of_base58_check_exn
 
 module type Base_intf = sig
-  val accounts : (Private_key.t option * Account.t) list
+  val accounts : (Private_key.t option * Account.t) list Lazy.t
 end
 
 module Make_from_base (Base : Base_intf) : Intf.S = struct
   include Base
 
   (* TODO: #1488 compute this at compile time instead of lazily *)
   let t =
-    lazy
-      (let ledger = Ledger.create_ephemeral () in
-       List.iter accounts ~f:(fun (_, account) ->
-           Ledger.create_new_account_exn ledger account.public_key account ) ;
-       ledger)
+    let open Lazy.Let_syntax in
+    let%map accounts = accounts in
+    let ledger = Ledger.create_ephemeral () in
+    List.iter accounts ~f:(fun (_, account) ->
+        Ledger.create_new_account_exn ledger account.public_key account ) ;
+    ledger
 
   let find_account_record_exn ~f =
-    List.find_exn accounts ~f:(fun (_, account) -> f account)
+    List.find_exn (Lazy.force accounts) ~f:(fun (_, account) -> f account)
 
   let find_new_account_record_exn old_account_pks =
     find_account_record_exn ~f:(fun new_account ->
@@ -54,7 +55,7 @@ module Make_from_base (Base : Base_intf) : Intf.S = struct
       ^ "genesis ledger has no accounts"
     in
     Memo.unit (fun () ->
-        List.max_elt accounts ~compare:(fun (_, a) (_, b) ->
+        List.max_elt (Lazy.force accounts) ~compare:(fun (_, a) (_, b) ->
             Balance.compare a.balance b.balance )
         |> Option.value_exn ?here:None ?error:None ~message:error_msg )
 
@@ -67,13 +68,15 @@ module With_private = struct
     {pk: Public_key.Compressed.t; sk: Private_key.t; balance: int}
 
   module type Source_intf = sig
-    val accounts : account_data list
+    val accounts : account_data list Lazy.t
   end
 
   module Make (Source : Source_intf) : Intf.S = struct
     include Make_from_base (struct
       let accounts =
-        List.map Source.accounts ~f:(fun {pk; sk; balance} ->
+        let open Lazy.Let_syntax in
+        let%map accounts = Source.accounts in
+        List.map accounts ~f:(fun {pk; sk; balance} ->
             (Some sk, Account.create pk (Balance.of_int balance)) )
     end)
   end
@@ -86,13 +89,15 @@ module Without_private = struct
     ; delegate: Public_key.Compressed.t option }
 
   module type Source_intf = sig
-    val accounts : account_data list
+    val accounts : account_data list Lazy.t
   end
 
   module Make (Source : Source_intf) : Intf.S = struct
     include Make_from_base (struct
       let accounts =
-        List.map Source.accounts ~f:(fun {pk; balance; delegate} ->
+        let open Lazy.Let_syntax in
+        let%map accounts = Source.accounts in
+        List.map accounts ~f:(fun {pk; balance; delegate} ->
             let base_acct = Account.create pk (Balance.of_int balance) in
             (None, {base_acct with delegate= Option.value ~default:pk delegate})
         )
diff --git a/src/lib/test_genesis_ledger/intf.ml b/src/lib/test_genesis_ledger/intf.ml
@@ -4,7 +4,7 @@ open Signature_lib
 module type S = sig
   val t : Ledger.t Lazy.t
 
-  val accounts : (Private_key.t option * Account.t) list
+  val accounts : (Private_key.t option * Account.t) list Lazy.t
 
   val find_account_record_exn :
     f:(Account.t -> bool) -> Private_key.t option * Account.t
diff --git a/src/lib/test_genesis_ledger/release_ledger.ml b/src/lib/test_genesis_ledger/release_ledger.ml
@@ -5,10 +5,11 @@ open Core
 (* TODO: generate new keypairs before public testnet *)
 include Make (struct
   let accounts =
-    let high_balances = List.init 1 ~f:(Fn.const 10_000_000) in
-    let low_balances = List.init 17 ~f:(Fn.const 1_000) in
-    let balances = high_balances @ low_balances in
-    let keypairs = Lazy.force Coda_base.Sample_keypairs.keypairs in
-    List.mapi balances ~f:(fun i b ->
-        {balance= b; pk= fst keypairs.(i); sk= snd keypairs.(i)} )
+    lazy
+      (let high_balances = List.init 1 ~f:(Fn.const 10_000_000) in
+       let low_balances = List.init 17 ~f:(Fn.const 1_000) in
+       let balances = high_balances @ low_balances in
+       let keypairs = Lazy.force Coda_base.Sample_keypairs.keypairs in
+       List.mapi balances ~f:(fun i b ->
+           {balance= b; pk= fst keypairs.(i); sk= snd keypairs.(i)} ))
 end)
diff --git a/src/lib/test_genesis_ledger/test_delegation_ledger.ml b/src/lib/test_genesis_ledger/test_delegation_ledger.ml
@@ -4,8 +4,9 @@ open Core
 include Make (struct
   let accounts =
     (* zeroth account becomes delegatee; first account is a placeholder; second account is delegator *)
-    let balances = [0; 0; 5_000_000] in
-    let keypairs = Lazy.force Coda_base.Sample_keypairs.keypairs in
-    List.mapi balances ~f:(fun i b ->
-        {balance= b; pk= fst keypairs.(i); sk= snd keypairs.(i)} )
+    lazy
+      (let balances = [0; 0; 5_000_000] in
+       let keypairs = Lazy.force Coda_base.Sample_keypairs.keypairs in
+       List.mapi balances ~f:(fun i b ->
+           {balance= b; pk= fst keypairs.(i); sk= snd keypairs.(i)} ))
 end)
diff --git a/src/lib/test_genesis_ledger/test_five_even_stakes.ml b/src/lib/test_genesis_ledger/test_five_even_stakes.ml
diff --git a/src/lib/test_genesis_ledger/test_ledger.ml b/src/lib/test_genesis_ledger/test_ledger.ml
diff --git a/src/lib/test_genesis_ledger/test_split_two_stakes_ledger.ml b/src/lib/test_genesis_ledger/test_split_two_stakes_ledger.ml
diff --git a/src/lib/test_genesis_ledger/test_three_even_stakes_ledger.ml b/src/lib/test_genesis_ledger/test_three_even_stakes_ledger.ml
diff --git a/src/lib/test_genesis_ledger/testnet_postake_ledger.ml b/src/lib/test_genesis_ledger/testnet_postake_ledger.ml
diff --git a/src/lib/test_genesis_ledger/testnet_postake_many_producers.ml b/src/lib/test_genesis_ledger/testnet_postake_many_producers.ml
diff --git a/src/lib/transaction_status/transaction_status.ml b/src/lib/transaction_status/transaction_status.ml
diff --git a/src/lib/transition_frontier/tests/full_frontier_tests.ml b/src/lib/transition_frontier/tests/full_frontier_tests.ml
diff --git a/src/lib/transition_frontier/transition_frontier.ml b/src/lib/transition_frontier/transition_frontier.ml
