diff --git a/src/api.ml b/src/api.ml index 09f1c9e9..a47b08cc 100644 --- a/src/api.ml +++ b/src/api.ml @@ -614,9 +614,8 @@ module GlobalFees = struct account_fee: Amount.t; purse_fee: Amount.t; history_expiration: RelativeTime.t; - purse_account_limit: int; + purse_account_limit: int32; purse_timeout: RelativeTime.t; - (* Signature of TALER_GlobalFeesPS. *) master_sig: GlobalFees.t; } @@ -651,7 +650,7 @@ module GlobalFees = struct |> mem "account_fee" Amount.jsont ~enc:account_fee |> mem "purse_fee" Amount.jsont ~enc:purse_fee |> mem "history_expiration" RelativeTime.jsont ~enc:history_expiration - |> mem "purse_account_limit" Jsont.int ~enc:purse_account_limit + |> mem "purse_account_limit" Jsont.int32 ~enc:purse_account_limit |> mem "purse_timeout" RelativeTime.jsont ~enc:purse_timeout |> mem "master_sig" GlobalFees.jsont ~enc:master_sig |> finish diff --git a/src/management.ml b/src/management.ml index 7caa0eb5..3ae7c7d8 100644 --- a/src/management.ml +++ b/src/management.ml @@ -364,9 +364,6 @@ let verify_global_fees (* TODO what is kyc_timeout, kyc_fee ? *) let kyc_timeout = dummy_relative_time in let kyc_fee = dummy_amount in - (* TODO force integer value to be a valid int64/int32 and in valid json integer range - in jsont encodings *) - let purse_account_limit = Int32.of_int purse_account_limit in (* * *) let open Bin_sig.GlobalFees in verify ~key:Config.Exchange.master_public_key master_sig diff --git a/src/pg.ml b/src/pg.ml index e0774284..aa913e5c 100644 --- a/src/pg.ml +++ b/src/pg.ml @@ -284,7 +284,6 @@ let insert_global_fee = } -> (* TODO time *) - let purse_account_limit = Int32.of_int purse_account_limit in let purse_timeout = None in let history_expiration = None in Conn.exec insert_global_fee