diff --git a/src/crypto.ml b/src/crypto.ml index d97315f7..aac1d07d 100644 --- a/src/crypto.ml +++ b/src/crypto.ml @@ -269,7 +269,7 @@ type eddsa_sig = EddsaSignature.t type rsa_priv = RsaPrivateKey.t type rsa_pub = RsaPublicKey.t type rsa_sig = RsaSignature.t -type denomination_hash = Hash.DenominationHash.t +type denom_hash = Hash.DenominationHash.t (* WIP *) module FDH_RSA = struct diff --git a/src/denomination.ml b/src/denomination.ml index 25bbe52e..c8b8603e 100644 --- a/src/denomination.ml +++ b/src/denomination.ml @@ -12,7 +12,7 @@ type t = { fee_refresh: Amount.t; fee_refund: Amount.t; age_mask: int; - h_pub: denomination_hash; + h_pub: denom_hash; master_sig: Signatures.DenominationKeyValidity.t; revoked_sig: Signatures.MasterDenominationKeyRevocation.t option; } diff --git a/src/pg.ml b/src/pg.ml index 91649f20..fa9abe10 100644 --- a/src/pg.ml +++ b/src/pg.ml @@ -67,7 +67,7 @@ let insert_signkey = let find_denom = let find_denom = - Caqti_type.(denomination_hash ->? denom_data) + Caqti_type.(denom_hash ->? denom_data) "SELECT dn.denom_pub, (dn.coin).*, dn.valid_from, dn.expire_withdraw, \ dn.expire_deposit, dn.expire_legal, (dn.fee_withdraw).*, \ (dn.fee_deposit).*, (dn.fee_refresh).*, (dn.fee_refund).*, dn.age_mask, \ @@ -104,7 +104,7 @@ let insert_denom = let insert_denomination_revocation = let denomination_revocation_insert = let master_sig = Signatures.MasterDenominationKeyRevocation.caqti in - Caqti_type.(t2 denomination_hash master_sig ->. unit) + Caqti_type.(t2 denom_hash master_sig ->. unit) "INSERT INTO denomination_revocations (denominations_serial, master_sig) \ SELECT denominations_serial, $2 FROM denominations WHERE \ denom_pub_hash=$1" @@ -168,7 +168,7 @@ let disable_auditor = let insert_auditor_denom_sig = let insert_auditor_denom_sig = let auditor_sig = Signatures.ExchangeKeyValidity.caqti in - Caqti_type.(t3 eddsa_pub denomination_hash auditor_sig ->. unit) + Caqti_type.(t3 eddsa_pub denom_hash auditor_sig ->. unit) "WITH ax AS (SELECT auditor_uuid FROM auditors WHERE auditor_pub=$1) \ INSERT INTO auditor_denom_sigs (auditor_uuid, denominations_serial, \ auditor_sig) SELECT ax.auditor_uuid, denominations_serial, $3 FROM \ @@ -185,8 +185,7 @@ let insert_auditor_denom_sig = let get_auditor_keys = let get_auditor_keys = let auditor_sig = Signatures.ExchangeKeyValidity.caqti in - Caqti_type.( - unit ->* t5 eddsa_pub string string denomination_hash auditor_sig) + Caqti_type.(unit ->* t5 eddsa_pub string string denom_hash auditor_sig) "SELECT a.auditor_pub, a.auditor_url, a.auditor_name, dn.denom_pub_hash, \ ads.auditor_sig FROM auditor_denom_sigs AS ads JOIN auditors AS a USING \ (auditor_uuid) JOIN denominations AS dn USING (denominations_serial) \ diff --git a/src/pg_type.ml b/src/pg_type.ml index 4f818585..40fb5826 100644 --- a/src/pg_type.ml +++ b/src/pg_type.ml @@ -32,7 +32,7 @@ include struct let fullpayto_hash = FullPaytoHash.caqti let nomalizaedpayto_hash = NormalizedPaytoHash.caqti - let denomination_hash = DenominationHash.caqti + let denom_hash = DenominationHash.caqti let privatecontract_hash = PrivateContractHash.caqti let extensionspolicy_hash = ExtensionsPolicyHash.caqti let merchantwire_hash = MerchantWireHash.caqti @@ -125,7 +125,7 @@ let denom_data = revoked_sig; }) (t12 rsa_pub amount time time time time amount amount amount amount int - (t3 denomination_hash master_sig revoked_sig)) + (t3 denom_hash master_sig revoked_sig)) let account_restrictions = custom