src/api.ml

@@ -2,7 +2,6 @@
    ppx?
    normalized JSON-object
      for signature of ExchangeKeysResponse.exetensions field
-   option: correct use opt_mem or Jsont.option
    properly combine jsont for "interface DenomGroupRsa extends DenomGroupCommon"
    better types:
      - payto_uri
@@ -242,15 +241,13 @@ module ExchangeVersionResponse = struct
     map ~kind:"ExchangeVersionResponse" make
     |> mem "version" Libtool_version.jsont ~enc:version
     |> mem "name" Jsont.string ~enc:name
-    |> mem "implementation" (Jsont.option Jsont.string) ~enc:implementation
+    |> opt_mem "implementation" Jsont.string ~enc:implementation
     |> mem "currency" Jsont.string ~enc:currency
-    |> mem "shopping_url" (Jsont.option Jsont.string) ~enc:shopping_url
+    |> opt_mem "shopping_url" Jsont.string ~enc:shopping_url
-    |> mem "open_banking_gateway"
+    |> opt_mem "open_banking_gateway" Jsont.string ~enc:open_banking_gateway
-         (Jsont.option Jsont.string)
-         ~enc:open_banking_gateway
     |> mem "currency_specification" CurrencySpecification.jsont
          ~enc:currency_specification
-    |> mem "aml_spa_dialect" (Jsont.option Jsont.string) ~enc:aml_spa_dialect
+    |> opt_mem "aml_spa_dialect" Jsont.string ~enc:aml_spa_dialect
     |> finish
 end
 
@@ -1010,7 +1007,7 @@ module RsaDenom = struct
     |> mem "stamp_expire_withdraw" Timestamp.jsont ~enc:stamp_expire_withdraw
     |> mem "stamp_expire_deposit" Timestamp.jsont ~enc:stamp_expire_deposit
     |> mem "stamp_expire_legal" Timestamp.jsont ~enc:stamp_expire_legal
-    |> mem "lost" (Jsont.option Jsont.bool) ~enc:lost
+    |> opt_mem "lost" Jsont.bool ~enc:lost
     |> finish
 end
 
@@ -1193,7 +1190,7 @@ module WireSetupMessage = struct
     |> mem "payto_uri" Jsont.string ~enc:payto_uri
     |> mem "master_sig_wire" MasterWireDetails.jsont ~enc:master_sig_wire
     |> mem "master_sig_add" MasterAddWire.jsont ~enc:master_sig_add
-    |> mem "conversion_url" (Jsont.option Jsont.string) ~enc:conversion_url
+    |> opt_mem "conversion_url" Jsont.string ~enc:conversion_url
     |> mem "credit_restrictions"
          (Jsont.list AccountRestriction.jsont)
          ~enc:credit_restrictions
@@ -1201,8 +1198,8 @@ module WireSetupMessage = struct
          (Jsont.list AccountRestriction.jsont)
          ~enc:debit_restrictions
     |> mem "validity_start" Timestamp.jsont ~enc:validity_start
-    |> mem "bank_label" (Jsont.option Jsont.string) ~enc:bank_label
+    |> opt_mem "bank_label" Jsont.string ~enc:bank_label
-    |> mem "priority" (Jsont.option Jsont.int) ~enc:priority
+    |> opt_mem "priority" Jsont.int ~enc:priority
     |> finish
 end