more module renaming
This commit is contained in:
parent
e4b9fb473a
commit
4490485fc2
5 changed files with 30 additions and 30 deletions
|
|
@ -364,7 +364,7 @@ module BlindingMasterSeed = MK_BASIC_32 ()
|
|||
|
||||
(* Format used for to generate the signature on a request to withdraw
|
||||
coins from a reserve. *)
|
||||
module WithdrawRequestPs = struct
|
||||
module WithdrawRequestPS = struct
|
||||
(* Purpose is #TALER_SIGNATURE_WALLET_RESERVE_WITHDRAW *)
|
||||
type t = {
|
||||
(* Amount to withdraw, excluding fees, i.e.
|
||||
|
|
@ -432,7 +432,7 @@ module WithdrawRequestPs = struct
|
|||
|> sealr
|
||||
end
|
||||
|
||||
module WithdrawConfirmationPs = struct
|
||||
module WithdrawConfirmationPS = struct
|
||||
(* Purpose is #TALER_SIGNATURE_EXCHANGE_CONFIRM_WITHDRAW.
|
||||
Signed by a `struct TALER_ExchangePrivateKeyP` using EdDSA. *)
|
||||
type t = {
|
||||
|
|
|
|||
28
src/json.ml
28
src/json.ml
|
|
@ -4,8 +4,8 @@ let encode_exn jsont v = Jsont_bytesrw.encode_string jsont v |> Result.get_ok
|
|||
let encode jsont v = Jsont_bytesrw.encode_string jsont v
|
||||
let decode jsont v = Jsont_bytesrw.decode_string jsont v
|
||||
|
||||
module Error_detail = struct
|
||||
open Error_detail
|
||||
module ErrorDetail = struct
|
||||
open ErrorDetail
|
||||
|
||||
let jsont =
|
||||
let make code hint = { code; hint } in
|
||||
|
|
@ -45,8 +45,8 @@ module Timestamp = struct
|
|||
|> Jsont.Object.finish
|
||||
end
|
||||
|
||||
module Relative_time = struct
|
||||
open Relative_time
|
||||
module RelativeTime = struct
|
||||
open RelativeTime
|
||||
|
||||
let number_or_forever_jsont =
|
||||
let forever =
|
||||
|
|
@ -87,8 +87,8 @@ module Eddsa = struct
|
|||
let signature_jsont = Jsont.string
|
||||
end
|
||||
|
||||
module Rsa_denomination_key = struct
|
||||
open Rsa_denomination_key
|
||||
module RsaDenominationKey = struct
|
||||
open RsaDenominationKey
|
||||
|
||||
let jsont =
|
||||
let make age_mask rsa_pub = { age_mask; rsa_pub } in
|
||||
|
|
@ -100,8 +100,8 @@ module Rsa_denomination_key = struct
|
|||
|> Jsont.Object.finish
|
||||
end
|
||||
|
||||
module CS_denomination_key = struct
|
||||
open CS_denomination_key
|
||||
module CSDenominationKey = struct
|
||||
open CSDenominationKey
|
||||
|
||||
let jsont =
|
||||
let make age_mask cs_pub = { age_mask; cs_pub } in
|
||||
|
|
@ -113,16 +113,16 @@ module CS_denomination_key = struct
|
|||
|> Jsont.Object.finish
|
||||
end
|
||||
|
||||
module Denomination_key = struct
|
||||
open Denomination_key
|
||||
module DenominationKey = struct
|
||||
open DenominationKey
|
||||
|
||||
let rsa v = Rsa v
|
||||
let cs v = CS v
|
||||
|
||||
let jsont =
|
||||
let open Jsont.Object in
|
||||
let rsa = Case.map "RSA" Rsa_denomination_key.jsont ~dec:rsa in
|
||||
let cs = Case.map "CS" CS_denomination_key.jsont ~dec:cs in
|
||||
let rsa = Case.map "RSA" RsaDenominationKey.jsont ~dec:rsa in
|
||||
let cs = Case.map "CS" CSDenominationKey.jsont ~dec:cs in
|
||||
let enc_case = function
|
||||
| Rsa v -> Case.value rsa v
|
||||
| CS v -> Case.value cs v
|
||||
|
|
@ -133,8 +133,8 @@ module Denomination_key = struct
|
|||
|> finish
|
||||
end
|
||||
|
||||
module Future_sign_key = struct
|
||||
open Future_sign_key
|
||||
module FutureSignKey = struct
|
||||
open FutureSignKey
|
||||
|
||||
let jsont =
|
||||
(* TODO ppx? *)
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@
|
|||
along with this program. If not, see <https://www.gnu.org/licenses/>. *)
|
||||
|
||||
let error_detail ?hint _status =
|
||||
let open Types.Error_detail in
|
||||
let open Types.ErrorDetail in
|
||||
let open Json in
|
||||
let code = -1 in
|
||||
let s = encode_exn Error_detail.jsont { code; hint } in
|
||||
let s = encode_exn ErrorDetail.jsont { code; hint } in
|
||||
s
|
||||
|
||||
module Respond_with = struct
|
||||
|
|
|
|||
18
src/types.ml
18
src/types.ml
|
|
@ -1,5 +1,5 @@
|
|||
(* https://docs.taler.net/core/api-common.html#tsref-type-ErrorDetail *)
|
||||
module Error_detail = struct
|
||||
module ErrorDetail = struct
|
||||
(* TODO GANA error codes
|
||||
https://git.gnunet.org/gana.git/tree/gnu-taler-error-codes/registry.rec *)
|
||||
type t = {
|
||||
|
|
@ -21,7 +21,7 @@ module Timestamp = struct
|
|||
| Never
|
||||
end
|
||||
|
||||
module Relative_time = struct
|
||||
module RelativeTime = struct
|
||||
(* Duration in microseconds or "forever"
|
||||
to represent an infinite duration. Numeric
|
||||
values are capped at 2^53 - 1 inclusive. *)
|
||||
|
|
@ -147,19 +147,19 @@ module Rsa = struct
|
|||
let pub_to_string _pub = assert false
|
||||
end
|
||||
|
||||
module Hash_code = struct
|
||||
module HashCode = struct
|
||||
(* 32-byte value representing a point on Curve25519. *)
|
||||
type cs25519Point = string
|
||||
end
|
||||
|
||||
module Rsa_denomination_key = struct
|
||||
module RsaDenominationKey = struct
|
||||
type t = {
|
||||
age_mask: int;
|
||||
rsa_pub: string; (* Rsa.pub *)
|
||||
}
|
||||
end
|
||||
|
||||
module CS_denomination_key = struct
|
||||
module CSDenominationKey = struct
|
||||
(* Clause Schnorr *)
|
||||
type t = {
|
||||
age_mask: int;
|
||||
|
|
@ -167,13 +167,13 @@ module CS_denomination_key = struct
|
|||
}
|
||||
end
|
||||
|
||||
module Denomination_key = struct
|
||||
module DenominationKey = struct
|
||||
type t =
|
||||
| Rsa of Rsa_denomination_key.t
|
||||
| CS of CS_denomination_key.t
|
||||
| Rsa of RsaDenominationKey.t
|
||||
| CS of CSDenominationKey.t
|
||||
end
|
||||
|
||||
module Future_sign_key = struct
|
||||
module FutureSignKey = struct
|
||||
type t = {
|
||||
(* The actual exchange's EdDSA signing public key *)
|
||||
key: Eddsa.pub;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue