Merge pull request #14472 from MinaProtocol/fix/zero-vesting-period-alcotest

Fix zero vesting period test

Author: deepthiskumar

src/lib/mina_base/test/dune

@@ -17,6 +17,7 @@
   fields_derivers.zkapps
   fields_derivers.json
   fields_derivers.graphql
+  genesis_constants
   kimchi_backend.pasta
   kimchi_backend.pasta.basic
   mina_base
@@ -25,6 +26,7 @@
   pickles
   pickles.backend
   pickles_types
+  ppx_deriving_yojson.runtime
   ppx_version.runtime
   run_in_thread
   signature_lib

src/lib/mina_base/test/main.ml

@@ -140,10 +140,17 @@ let () =
           ] )
     ; Signature_test.
         ( "signatures"
-        , [ test_case "Signature decode after encode i identity" `Quick
+        , [ test_case "Signature decode after encode is identity" `Quick
               signature_decode_after_encode_is_identity
           ; test_case "Base58check is stable" `Quick base58Check_stable
           ] )
+    ; Zero_vesting_period.
+        ( "zero vesting period"
+        , [ test_case "Zero vesting period is error" `Quick
+              zero_vesting_period_is_error
+          ; test_case "Nonzero vesting period is OK" `Quick
+              nonzero_vesting_period_ok
+          ] )
     ; Zkapp_command_test.
         ( "zkApp commands"
         , [ test_case "Account_update_or_stack.of_zkapp_command_list." `Quick

src/lib/mina_base/test/zero_vesting_period.ml

@@ -1,16 +1,23 @@
+(** Testing
+    -------
+    Component:  Mina base
+    Invocation: dune exec src/lib/mina_base/test/main.exe -- \
+                  test '^zero vesting period$'
+    Subject:    Test zero vesting period detection
+ *)
+
 open Core_kernel
 open Mina_base
 
-let%test_module "zero_vesting" =
-  ( module struct
-    let mk_zkapp_with_vesting_period n =
-      sprintf
-        {json|
+let mk_zkapp_with_vesting_period n =
+  let res =
+    sprintf
+      {json|
 {
   "fee_payer": {
     "body": {
       "public_key": "B62qkb7Sed1VVsogq7qXzi79JNx9MkcbRihwwuSphUtBiEFPNTQfzNR",
-      "fee": "0.01",
+      "fee": "2.0",
       "valid_until": null,
       "nonce": "0"
     },
@@ -112,7 +119,25 @@ let%test_module "zero_vesting" =
                   "epoch_length": [ "Ignore" ]
                 }
               },
-              "account": [ "Accept" ],
+              "account": {
+                "balance": [ "Ignore" ],
+                "nonce": [ "Ignore" ],
+                "receipt_chain_hash": [ "Ignore" ],
+                "delegate": [ "Ignore" ],
+                "state": [
+                  [ "Ignore" ],
+                  [ "Ignore" ],
+                  [ "Ignore" ],
+                  [ "Ignore" ],
+                  [ "Ignore" ],
+                  [ "Ignore" ],
+                  [ "Ignore" ],
+                  [ "Ignore" ]
+                ],
+                "action_state": [ "Ignore" ],
+                "proved_state": [ "Ignore" ],
+                "is_new": [ "Ignore" ]
+              },
               "valid_while": [ "Ignore" ]
             },
             "use_full_commitment": true,
@@ -202,7 +227,25 @@ let%test_module "zero_vesting" =
                   "epoch_length": [ "Ignore" ]
                 }
               },
-              "account": [ "Accept" ],
+              "account": {
+                "balance": [ "Ignore" ],
+                "nonce": [ "Ignore" ],
+                "receipt_chain_hash": [ "Ignore" ],
+                "delegate": [ "Ignore" ],
+                "state": [
+                  [ "Ignore" ],
+                  [ "Ignore" ],
+                  [ "Ignore" ],
+                  [ "Ignore" ],
+                  [ "Ignore" ],
+                  [ "Ignore" ],
+                  [ "Ignore" ],
+                  [ "Ignore" ]
+                ],
+                "action_state": [ "Ignore" ],
+                "proved_state": [ "Ignore" ],
+                "is_new": [ "Ignore" ]
+              },
               "valid_while": [ "Ignore" ]
             },
             "use_full_commitment": false,
@@ -224,33 +267,37 @@ let%test_module "zero_vesting" =
 }
 
       |json}
-        n
-      |> Yojson.Safe.from_string |> Zkapp_command.of_yojson
-      |> Result.ok_or_failwith
+      n
+    |> Yojson.Safe.from_string |> Zkapp_command.of_yojson
+  in
+  match res with
+  | Ppx_deriving_yojson_runtime.Result.Ok zkapp ->
+      zkapp
+  | Ppx_deriving_yojson_runtime.Result.Error err ->
+      failwith err
 
-    let zkapp_zero_vesting_period = mk_zkapp_with_vesting_period 0
+let zkapp_zero_vesting_period = mk_zkapp_with_vesting_period 0
 
-    let%test "zero vesting period is error" =
-      match
-        User_command.check_well_formedness
-          ~genesis_constants:Genesis_constants.for_unit_tests
-          (Zkapp_command zkapp_zero_vesting_period)
-      with
-      | Error [ Zero_vesting_period ] ->
-          true
-      | Ok _ | Error _ ->
-          false
+let zero_vesting_period_is_error () =
+  match
+    User_command.check_well_formedness
+      ~genesis_constants:Genesis_constants.for_unit_tests
+      (Zkapp_command zkapp_zero_vesting_period)
+  with
+  | Error [ Zero_vesting_period ] ->
+      ()
+  | Ok _ | Error _ ->
+      assert false
 
-    let zkapp_nonzero_vesting_period = mk_zkapp_with_vesting_period 1
+let zkapp_nonzero_vesting_period = mk_zkapp_with_vesting_period 1
 
-    let%test "nonzero vesting period is ok" =
-      match
-        User_command.check_well_formedness
-          ~genesis_constants:Genesis_constants.for_unit_tests
-          (Zkapp_command zkapp_nonzero_vesting_period)
-      with
-      | Ok () ->
-          true
-      | Error errs ->
-          false
-  end )
+let nonzero_vesting_period_ok () =
+  match
+    User_command.check_well_formedness
+      ~genesis_constants:Genesis_constants.for_unit_tests
+      (Zkapp_command zkapp_nonzero_vesting_period)
+  with
+  | Ok () ->
+      ()
+  | Error _ ->
+      assert false