This commit is contained in:
parent
9b54747833
commit
1cb767114f
3 changed files with 2 additions and 7 deletions
|
|
@ -614,9 +614,8 @@ module GlobalFees = struct
|
||||||
account_fee: Amount.t;
|
account_fee: Amount.t;
|
||||||
purse_fee: Amount.t;
|
purse_fee: Amount.t;
|
||||||
history_expiration: RelativeTime.t;
|
history_expiration: RelativeTime.t;
|
||||||
purse_account_limit: int;
|
purse_account_limit: int32;
|
||||||
purse_timeout: RelativeTime.t;
|
purse_timeout: RelativeTime.t;
|
||||||
(* Signature of TALER_GlobalFeesPS. *)
|
|
||||||
master_sig: GlobalFees.t;
|
master_sig: GlobalFees.t;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -651,7 +650,7 @@ module GlobalFees = struct
|
||||||
|> mem "account_fee" Amount.jsont ~enc:account_fee
|
|> mem "account_fee" Amount.jsont ~enc:account_fee
|
||||||
|> mem "purse_fee" Amount.jsont ~enc:purse_fee
|
|> mem "purse_fee" Amount.jsont ~enc:purse_fee
|
||||||
|> mem "history_expiration" RelativeTime.jsont ~enc:history_expiration
|
|> 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 "purse_timeout" RelativeTime.jsont ~enc:purse_timeout
|
||||||
|> mem "master_sig" GlobalFees.jsont ~enc:master_sig
|
|> mem "master_sig" GlobalFees.jsont ~enc:master_sig
|
||||||
|> finish
|
|> finish
|
||||||
|
|
|
||||||
|
|
@ -364,9 +364,6 @@ let verify_global_fees
|
||||||
(* TODO what is kyc_timeout, kyc_fee ? *)
|
(* TODO what is kyc_timeout, kyc_fee ? *)
|
||||||
let kyc_timeout = dummy_relative_time in
|
let kyc_timeout = dummy_relative_time in
|
||||||
let kyc_fee = dummy_amount 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
|
let open Bin_sig.GlobalFees in
|
||||||
verify ~key:Config.Exchange.master_public_key master_sig
|
verify ~key:Config.Exchange.master_public_key master_sig
|
||||||
|
|
|
||||||
|
|
@ -284,7 +284,6 @@ let insert_global_fee =
|
||||||
}
|
}
|
||||||
->
|
->
|
||||||
(* TODO time *)
|
(* TODO time *)
|
||||||
let purse_account_limit = Int32.of_int purse_account_limit in
|
|
||||||
let purse_timeout = None in
|
let purse_timeout = None in
|
||||||
let history_expiration = None in
|
let history_expiration = None in
|
||||||
Conn.exec insert_global_fee
|
Conn.exec insert_global_fee
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue