better config: parse file + crunch

include/parse_config.ml

@@ -3,11 +3,6 @@
 
    do not support "$"-path expansion*)
 
-(* TODO
-   - do all config section
-   - parse alt_unit_names json pair
-   *)
-
 open Angstrom
 
 type item = {
@@ -21,14 +16,14 @@ type section = {
 }
 
 let fail_with msg =
-  Fmt.epr "Failed to parse configuration: %s.@." msg;
+  Fmt.epr "Configuration failure: %s.@." msg;
   exit 1
 
 let is_eol = function '\n' | '\r' -> true | _ -> false
 let is_whitespace = function ' ' | '\t' -> true | _ -> false
 let whitespace = skip_while is_whitespace
 
-module Parse_file = struct
+module Parse_data = struct
   type line =
     | Blank
     | Comment of string
@@ -90,7 +85,7 @@ module Parse_file = struct
     in
     loop [] [] (List.rev l)
 
-  let parse_content s =
+  let parse s =
     match parse_string ~consume:All config s with
     | Error msg -> fail_with (Fmt.str "parse error `%s`" msg)
     | Ok v -> fold_sections v
@@ -105,7 +100,7 @@ module Pp_debug = struct
 
   let pp_line ppf line =
     let open Fmt in
-    let open Parse_file in
+    let open Parse_data in
     match line with
     | Blank -> Fmt.nop ppf ()
     | Comment s -> pf ppf "#%s" s
@@ -225,6 +220,7 @@ let yes_no = function
   | "YES" -> `YES
   | s -> fail_with (Fmt.str "expected `YES`/`NO` value, got `%s`" s)
 
+let uri s = Uri.of_string s
 let amount s = s |> Amount.of_string |> unwrap_res
 let duration s = Parse_duration.(s |> parse |> to_ptime_span)
 
@@ -278,135 +274,3 @@ module Parse_alt_unit_names = struct
         in
         (k, v))
 end
-
-module Config = struct
-  [@@@ocaml.warning "-32-69"]
-
-  let config =
-    let read_file file = In_channel.with_open_bin file In_channel.input_all in
-    let content = read_file "default.config" in
-    let v = Parse_file.parse_content content in
-    (*Fmt.pr "config file:@\n%a@." Pp_debug.pp_config v;*)
-    v
-
-  module Exchange = struct
-    let get_opt field = get_opt config ~section:"exchange" ~field
-    let get field = get config ~section:"exchange" ~field
-
-    (* - *)
-    let currency = (* todo: constraint on currency string *) get "currency"
-    let currency_round_unit = get "currency_round_unit" |> amount
-    let db = get "db" |> const_value "postgres"
-    let attribute_encryption_key = get "attribute_encryption_key"
-    let port = get "port" |> int
-    let bind_to = get "bind_to"
-    let master_public_key = get "master_public_key" |> ed25519
-    let stefan_abs = get "stefan_abs" |> amount
-    let stefan_log = get "stefan_log" |> amount
-    let stefan_lin = get_opt "stefan_lin" |> Option.map float
-
-    let aggregator_idle_sleep_interval =
-      get "aggregator_idle_sleep_interval" |> duration
-
-    let closer_idle_sleep_interval =
-      get "closer_idle_sleep_interval" |> duration
-
-    let transfer_idle_sleep_interval =
-      get "transfer_idle_sleep_interval" |> duration
-
-    let wirewatch_idle_sleep_interval =
-      get "wirewatch_idle_sleep_interval" |> duration
-
-    let signkey_legal_duration = get "signkey_legal_duration" |> duration
-    let max_keys_caching = get "max_keys_caching" |> duration
-    let enable_kyc = get "enable_kyc" |> yes_no
-
-    (* optional:
-       tiny_amount
-       shopping_url
-       open_banking_gateway_url
-       aml_spa_dialect
-       bank_compliance_language
-       toplevel_redirect_url *)
-    (* not implemented or not relevant to MTE:
-       let max_requests = get "max_requests" |> int
-       base_url
-       aggregator_shard_size
-       serve
-       unixpath
-       unixpath_mode
-       terms_dir
-       terms_etag
-       privacy_dir
-       privacy_etag *)
-  end
-
-  module Exchangedb = struct
-    let get field = get config ~section:"exchangedb" ~field
-
-    (* - *)
-    let idle_reserve_expiration_time =
-      get "idle_reserve_expiration_time" |> duration
-
-    let legal_reserve_expiration_time =
-      get "legal_reserve_expiration_time" |> duration
-
-    let aggregator_shift = get "aggregator_shift" |> duration
-    let max_aml_program_runtime = get "max_aml_program_runtime" |> duration
-    let default_purse_limit = get "default_purse_limit" |> int
-  end
-
-  module Currency = struct
-    type t = {
-      enabled: [ `YES | `NO ];
-      code: string;
-      name: string;
-      fractional_input_digits: int;
-      fractional_normal_digits: int;
-      fractional_trailing_zero_digits: int;
-      alt_unit_names: (int * string) list;
-    }
-
-    let currency_sections =
-      List.filter_map
-        (fun v ->
-          match String.starts_with ~prefix:"currency-" v.header with
-          | false -> None
-          | true -> Some v)
-        config
-
-    let parse_currency section =
-      let get field = get config ~section:section.header ~field in
-      {
-        enabled= get "enabled" |> yes_no;
-        code= get "code";
-        name= get "name";
-        fractional_input_digits= get "fractional_input_digits" |> int;
-        fractional_normal_digits= get "fractional_normal_digits" |> int;
-        fractional_trailing_zero_digits=
-          get "fractional_trailing_zero_digits" |> int;
-        alt_unit_names= get "alt_unit_names" |> Parse_alt_unit_names.parse;
-      }
-
-    let all_currencies = List.map parse_currency currency_sections
-
-    (* I think the exchange only handle one currency *)
-    let v =
-      match
-        List.find_opt (fun v -> v.code = Exchange.currency) all_currencies
-      with
-      | None ->
-          fail_with
-            (Fmt.str
-               "section `[currency-%s]` not found, currency `%s` is not defined"
-               Exchange.currency Exchange.currency)
-      | Some v -> v
-
-    (*
-    let () =
-      let pp_pair ppf (k, v) = Fmt.pf ppf "k: %d - v: %s" k v in
-      Fmt.epr "alt unit names:@\n%a@." (Fmt.list pp_pair) v.alt_unit_names;
-      ()
-      *)
-  end
-end