fix for one of the testnet prover failures (#4321)

* prover fix1

* run full-test for at least 2 epochs

Author: deepthiskumar

.circleci/config.yml

@@ -675,9 +675,6 @@ jobs:
             - run:
                   name: Running test -- test_postake_split_snarkless:coda-shared-prefix-test -who-produces 1
                   command: ./scripts/skip_if_only_frontend.sh bash -c 'source ~/.profile && ./scripts/test.py run "test_postake_split_snarkless:coda-shared-prefix-test -who-produces 1"'
-            - run:
-                  name: Running test -- test_postake_split_snarkless:coda-restart-node-test
-                  command: ./scripts/skip_if_only_frontend.sh bash -c 'source ~/.profile && ./scripts/test.py run "test_postake_split_snarkless:coda-restart-node-test"'
             - run:
                   name: Running test -- test_postake_split_snarkless:coda-change-snark-worker-test
                   command: ./scripts/skip_if_only_frontend.sh bash -c 'source ~/.profile && ./scripts/test.py run "test_postake_split_snarkless:coda-change-snark-worker-test"'
@@ -717,6 +714,20 @@ jobs:
                   command: ./scripts/skip_if_only_frontend.sh bash -c 'source ~/.profile && ./scripts/test.py run "test_postake_txns:coda-batch-payment-test"'
             - store_artifacts:
                   path: test_logs
+    test--test_postake_full_epoch:
+        resource_class: xlarge
+        docker:
+            - image: codaprotocol/coda:toolchain-54430467ba429af285ea937d1c1da7d4b4cbde3e
+        steps:
+            - checkout
+            - run:
+                  name: Update OPAM
+                  command: ./scripts/update-opam-in-docker.sh
+            - run:
+                  name: Running test -- test_postake_full_epoch:full-test
+                  command: ./scripts/skip_if_only_frontend.sh bash -c 'source ~/.profile && ./scripts/test.py run "test_postake_full_epoch:full-test"'
+            - store_artifacts:
+                  path: test_logs
     test--test_postake_medium_curves:
         resource_class: xlarge
         docker:
@@ -810,6 +821,7 @@ workflows:
                     - /release\/.*/
         jobs:
           - test-unit--dev_medium_curves
+          - test--test_postake_full_epoch
           - test--test_postake_medium_curves
           - test--test_postake_snarkless_medium_curves
           - test--test_postake_split_medium_curves

.circleci/config.yml.jinja

@@ -509,7 +509,7 @@ jobs:
                   path: test_logs
     {%- endfor %}
 
-    {%- for profile in medium_curves_tests.keys() | sort %}
+    {%- for profile in medium_curves_and_other_tests.keys() | sort %}
     test--{{profile}}:
         resource_class: xlarge
         docker:
@@ -519,7 +519,7 @@ jobs:
             - run:
                   name: Update OPAM
                   command: ./scripts/update-opam-in-docker.sh
-            {%- for test in medium_curves_tests[profile] %}
+            {%- for test in medium_curves_and_other_tests[profile] %}
             - run:
                   name: Running test -- {{profile}}:{{test}}
                   command: ./scripts/skip_if_only_frontend.sh bash -c 'source ~/.profile && ./scripts/test.py run "{{profile}}:{{test}}"'
@@ -569,6 +569,6 @@ workflows:
           {%- for profile in unit_test_profiles_medium_curves %}
           - test-unit--{{profile}}
           {%- endfor %}
-          {%- for profile in medium_curves_tests.keys() | sort %}
+          {%- for profile in medium_curves_and_other_tests.keys() | sort %}
           - test--{{profile}}
           {%- endfor %}

scripts/test.py

@@ -28,7 +28,6 @@
     'coda-block-production-test',
     'coda-shared-prefix-test -who-produces 0',
     'coda-shared-prefix-test -who-produces 1',
-    'coda-restart-node-test',
     'coda-change-snark-worker-test',
     'coda-archive-node-test'
 ]
@@ -58,13 +57,14 @@
     ['coda-shared-prefix-multiproducer-test -num-block-producers 5 -payments'],
 }
 
-medium_curves_tests = {
+medium_curves_and_other_tests = {
     'test_postake_medium_curves':
     simple_tests,
     'test_postake_snarkless_medium_curves':
     simple_tests,
     'test_postake_split_medium_curves':
     ['coda-shared-prefix-multiproducer-test -num-block-producers 2'],
+    'test_postake_full_epoch': ['full-test'],
 }
 
 medium_curve_profiles_full = [
@@ -190,7 +190,7 @@ def do():
             build_targets = '%s %s' % (coda_exe, logproc_exe)
 
     all_tests = small_curves_tests
-    all_tests.update(medium_curves_tests)
+    all_tests.update(medium_curves_and_other_tests)
     all_tests = filter_tests(all_tests, args.includes_patterns,
                              args.excludes_patterns)
     if len(all_tests) == 0:
@@ -285,7 +285,7 @@ def render(args):
         unit_test_profiles=unit_test_profiles,
         unit_test_profiles_medium_curves=unit_test_profiles_medium_curves,
         small_curves_tests=tests,
-        medium_curves_tests=medium_curves_tests,
+        medium_curves_and_other_tests=medium_curves_and_other_tests,
         medium_curve_profiles=medium_curve_profiles_full)
 
     if args.check:
@@ -319,7 +319,7 @@ def render(args):
 
 def list_tests(_args):
     all_tests = small_curves_tests
-    all_tests.update(medium_curves_tests)
+    all_tests.update(medium_curves_and_other_tests)
     for profile in all_tests.keys():
         print('- ' + profile)
         for test in small_curves_tests[profile]:

src/app/cli/src/tests/full_test.ml

@@ -66,6 +66,9 @@ let setup_time_offsets () = ()
 
 let heartbeat_flag = ref true
 
+[%%inject
+"test_full_epoch", test_full_epoch]
+
 let print_heartbeat logger =
   let rec loop () =
     if !heartbeat_flag then (
@@ -217,14 +220,14 @@ let run_test () : unit Deferred.t =
            (Coda_lib.validated_transitions coda)
            ~f:ignore) ;
       let%bind () = Ivar.read @@ Coda_lib.initialization_finish_signal coda in
-      let wait_until_cond ~(f : Coda_lib.t -> bool) ~(timeout : Float.t) =
+      let wait_until_cond ~(f : Coda_lib.t -> bool) ~(timeout_min : Float.t) =
         let rec go () =
           if f coda then return ()
           else
             let%bind () = after (Time.Span.of_sec 10.) in
             go ()
         in
-        Deferred.any [after (Time.Span.of_min timeout); go ()]
+        Deferred.any [after (Time.Span.of_min timeout_min); go ()]
       in
       let balance_change_or_timeout ~initial_receiver_balance receiver_pk =
         let cond t =
@@ -238,7 +241,7 @@ let run_test () : unit Deferred.t =
           | _ ->
               false
         in
-        wait_until_cond ~f:cond ~timeout:3.
+        wait_until_cond ~f:cond ~timeout_min:3.
       in
       let assert_balance pk amount =
         match
@@ -374,11 +377,11 @@ let run_test () : unit Deferred.t =
         |> Participating_state.active_exn |> Protocol_state.consensus_state
         |> Consensus.Data.Consensus_state.blockchain_length
       in
-      let wait_for_proof_or_timeout timeout () =
+      let wait_for_proof_or_timeout timeout_min () =
         let cond t = Option.is_some @@ Coda_lib.staged_ledger_ledger_proof t in
-        wait_until_cond ~f:cond ~timeout
+        wait_until_cond ~f:cond ~timeout_min
       in
-      let test_multiple_payments accounts ~txn_count timeout =
+      let test_multiple_payments accounts ~txn_count timeout_min =
         let balance_sheet =
           Public_key.Compressed.Map.of_alist_exn
             (List.map accounts
@@ -391,7 +394,7 @@ let run_test () : unit Deferred.t =
               Currency.Amount.of_int ((i + 1) * 10) )
         in
         (*After mining a few blocks and emitting a ledger_proof (by the parallel scan), check if the balances match *)
-        let%map () = wait_for_proof_or_timeout timeout () in
+        let%map () = wait_for_proof_or_timeout timeout_min () in
         assert (Option.is_some @@ Coda_lib.staged_ledger_ledger_proof coda) ;
         Map.fold updated_balance_sheet ~init:() ~f:(fun ~key ~data () ->
             assert_balance key data ) ;
@@ -443,23 +446,40 @@ let run_test () : unit Deferred.t =
         else if with_snark then 15.
         else 7.
       in
+      let wait_till_length =
+        if medium_curves then Coda_numbers.Length.of_int 1
+        else if test_full_epoch then
+          (*Note: wait to produce (2*slots_per_epoch) blocks. This could take a while depending on what k and c are*)
+          Coda_numbers.Length.of_int
+            (Unsigned.UInt32.to_int
+               Consensus.Constants.(
+                 Unsigned.UInt32.(mul slots_per_epoch (of_int 2))))
+        else Coda_numbers.Length.of_int 5
+      in
       let%map () =
         if with_snark then
           let accounts = List.take other_accounts 2 in
           let%bind blockchain_length' =
             test_multiple_payments accounts ~txn_count:2 timeout_mins
           in
-          (*wait for a block after the ledger_proof is emitted*)
+          (*wait for some blocks after the ledger_proof is emitted*)
           let%map () =
             wait_until_cond
-              ~f:(fun t -> blockchain_length t > blockchain_length')
-              ~timeout:
+              ~f:(fun t ->
+                blockchain_length t
+                > Coda_numbers.Length.add blockchain_length' wait_till_length
+                )
+              ~timeout_min:
                 ( Consensus.Constants.(
-                    (delta + c) * Consensus.Constants.block_window_duration_ms)
+                    (delta + c)
+                    * ( block_window_duration_ms
+                      * (Coda_numbers.Length.to_int wait_till_length + 1) ))
                   / 1000 / 60
                 |> Float.of_int )
           in
-          assert (blockchain_length coda > blockchain_length')
+          assert (
+            blockchain_length coda
+            > Coda_numbers.Length.add blockchain_length' wait_till_length )
         else if with_check then
           let%map _ =
             test_multiple_payments other_accounts

src/config/debug.mlh

@@ -23,3 +23,5 @@
 [%%define print_versioned_types false]
 
 [%%define daemon_expiry "never"]
+[%%define test_full_epoch false]
+

src/config/dev.mlh

@@ -23,3 +23,5 @@
 [%%define print_versioned_types false]
 
 [%%define daemon_expiry "never"]
+[%%define test_full_epoch false]
+

src/config/dev_frontend.mlh

@@ -23,3 +23,5 @@
 [%%define print_versioned_types false]
 
 [%%define daemon_expiry "never"]
+[%%define test_full_epoch false]
+

src/config/dev_medium_curves.mlh

@@ -23,3 +23,5 @@
 [%%define print_versioned_types false]
 
 [%%define daemon_expiry "never"]
+[%%define test_full_epoch false]
+

src/config/dev_snark.mlh

@@ -23,3 +23,5 @@
 [%%define print_versioned_types false]
 
 [%%define daemon_expiry "never"]
+[%%define test_full_epoch false]
+

src/config/fake_hash.mlh

@@ -23,3 +23,4 @@
 [%%define print_versioned_types false]
 
 [%%define daemon_expiry "never"]
+[%%define test_full_epoch false]