PR #16186, split for re-review

src/lib/cli_lib/commands.ml

@@ -230,16 +230,20 @@ module Vrf = struct
         flag "--total-stake"
           ~doc:"AMOUNT The total balance of all accounts in the epoch ledger"
           (optional int)
-      in
+      and config_file = Flag.config_files in
       Exceptions.handle_nicely
       @@ fun () ->
       let env = Secrets.Keypair.env in
-      let constraint_constants =
-        Genesis_constants.Compiled.constraint_constants
+      let open Deferred.Let_syntax in
+      let%bind constraint_constants =
+        let logger = Logger.create () in
+        let%map conf =
+          Runtime_config.Constants.load_constants ~logger config_file
+        in
+        Runtime_config.Constants.constraint_constants conf
       in
       if Option.is_some (Sys.getenv env) then
         eprintf "Using password from environment variable %s\n" env ;
-      let open Deferred.Let_syntax in
       (* TODO-someday: constraint constants from config file. *)
       let%bind () =
         let password =
@@ -297,17 +301,21 @@ module Vrf = struct
          \"epochSeed\": _, \"delegatorIndex\": _} JSON message objects read on \
          stdin"
       (let open Command.Let_syntax in
-      let%map_open privkey_path = Flag.privkey_read_path in
+      let%map_open privkey_path = Flag.privkey_read_path
+      and config_file = Flag.config_files in
       Exceptions.handle_nicely
       @@ fun () ->
-      let constraint_constants =
-        Genesis_constants.Compiled.constraint_constants
-      in
       let env = Secrets.Keypair.env in
       if Option.is_some (Sys.getenv env) then
         eprintf "Using password from environment variable %s\n" env ;
       let open Deferred.Let_syntax in
-      (* TODO-someday: constraint constants from config file. *)
+      let%bind constraint_constants =
+        let logger = Logger.create () in
+        let%map conf =
+          Runtime_config.Constants.load_constants ~logger config_file
+        in
+        Runtime_config.Constants.constraint_constants conf
+      in
       let%bind () =
         let password =
           lazy
@@ -362,13 +370,18 @@ module Vrf = struct
          totalStake: 1000000000}. The threshold is not checked against a \
          ledger; this should be done manually to confirm whether threshold_met \
          in the output corresponds to an actual won block."
-      ( Command.Param.return @@ Exceptions.handle_nicely
+      (let open Command.Let_syntax in
+      let%map_open config_file = Flag.config_files in
+      Exceptions.handle_nicely
       @@ fun () ->
       let open Deferred.Let_syntax in
-      let constraint_constants =
-        Genesis_constants.Compiled.constraint_constants
+      let%bind constraint_constants =
+        let logger = Logger.create () in
+        let%map conf =
+          Runtime_config.Constants.load_constants ~logger config_file
+        in
+        Runtime_config.Constants.constraint_constants conf
       in
-      (* TODO-someday: constraint constants from config file. *)
       let lexbuf = Lexing.from_channel In_channel.stdin in
       let lexer = Yojson.init_lexer () in
       let%bind () =
@@ -399,7 +412,7 @@ module Vrf = struct
                      (Error_json.error_to_yojson err) ) ;
                 `Repeat () )
       in
-      exit 0 )
+      exit 0)
 
   let command_group =
     Command.group ~summary:"Commands for vrf evaluations"