rm suffix

src/bin_sig.ml

@@ -75,7 +75,7 @@ end = struct
       octets
 end
 
-module DenominationKeyAnnouncementPS = struct
+module DenominationKeyAnnouncement = struct
   module R = struct
     (* TODO taler_signatures purpose
      we use TALER_SIGNATURE_SM_RSA_DENOMINATION_KEY instead here *)
@@ -107,7 +107,7 @@ module DenominationKeyAnnouncementPS = struct
   include MK (R)
 end
 
-module SigningKeyAnnouncementPS = struct
+module SigningKeyAnnouncement = struct
   module R = struct
     (* purpose.purpose = TALER_SIGNATURE_SM_SIGNING_KEY *)
     type r = {
@@ -132,7 +132,7 @@ module SigningKeyAnnouncementPS = struct
   include MK (R)
 end
 
-module DenominationKeyValidityPS = struct
+module DenominationKeyValidity = struct
   module R = struct
     (* purpose.purpose = TALER_SIGNATURE_MASTER_DENOMINATION_KEY_VALIDITY *)
     type r = {
@@ -196,7 +196,7 @@ module DenominationKeyValidityPS = struct
   include MK (R)
 end
 
-module ExchangeSigningKeyValidityPS = struct
+module ExchangeSigningKeyValidity = struct
   module R = struct
     (* purpose.purpose = TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY *)
     type r = {
@@ -224,7 +224,7 @@ module ExchangeSigningKeyValidityPS = struct
   include MK (R)
 end
 
-module MasterDenominationKeyRevocationPS = struct
+module MasterDenominationKeyRevocation = struct
   module R = struct
     (* purpose.purpose = TALER_SIGNATURE_MASTER_DENOMINATION_KEY_REVOKED. *)
     type r = { h_denom_pub: DenominationHash.t }
@@ -243,7 +243,7 @@ module MasterDenominationKeyRevocationPS = struct
   include MK (R)
 end
 
-module MasterSigningKeyRevocationPS = struct
+module MasterSigningKeyRevocation = struct
   module R = struct
     (* purpose.purpose = TALER_SIGNATURE_MASTER_SIGNING_KEY_REVOKED *)
     type r = { exchange_pub: ExchangePublicKeyP.t }
@@ -262,7 +262,7 @@ module MasterSigningKeyRevocationPS = struct
   include MK (R)
 end
 
-module MasterAddAuditorPS = struct
+module MasterAddAuditor = struct
   module R = struct
     (* purpose.purpose = TALER_SIGNATURE_MASTER_ADD_AUDITOR *)
     type r = {
@@ -287,7 +287,7 @@ module MasterAddAuditorPS = struct
   include MK (R)
 end
 
-module MasterDelAuditorPS = struct
+module MasterDelAuditor = struct
   module R = struct
     (* purpose.purpose = TALER_SIGNATURE_MASTER_DEL_AUDITOR *)
     type r = {
@@ -309,7 +309,7 @@ module MasterDelAuditorPS = struct
   include MK (R)
 end
 
-module GlobalFeesPS = struct
+module GlobalFees = struct
   module R = struct
     (* purpose.purpose = TALER_SIGNATURE_MASTER_GLOBAL_FEES *)
     type r = {
@@ -372,7 +372,7 @@ module GlobalFeesPS = struct
   include MK (R)
 end
 
-module MasterWireDetailsPS = struct
+module MasterWireDetails = struct
   module R = struct
     (* purpose.purpose = TALER_SIGNATURE_MASTER_WIRE_DETAILS *)
     type r = {
@@ -411,7 +411,7 @@ module MasterWireDetailsPS = struct
   include MK (R)
 end
 
-module MasterAddWirePS = struct
+module MasterAddWire = struct
   module R = struct
     (* purpose.purpose = TALER_SIGNATURE_MASTER_ADD_WIRE *)
     type r = {
@@ -454,7 +454,7 @@ module MasterAddWirePS = struct
   include MK (R)
 end
 
-module MasterDelWirePS = struct
+module MasterDelWire = struct
   module R = struct
     (* purpose.purpose = TALER_SIGNATURE_MASTER_DEL_WIRE *)
     type r = {
@@ -476,7 +476,7 @@ module MasterDelWirePS = struct
   include MK (R)
 end
 
-module MasterDrainProfitPS = struct
+module MasterDrainProfit = struct
   module R = struct
     (* purpose.purpose = TALER_SIGNATURE_MASTER_DRAIN_PROFITS *)
     type r = {
@@ -505,7 +505,7 @@ module MasterDrainProfitPS = struct
   include MK (R)
 end
 
-module MasterAmlOfficerStatusPS = struct
+module MasterAmlOfficerStatus = struct
   module R = struct
     (* purpose.purpose = TALER_SIGNATURE_MASTER_AML_KEY *)
     type r = {
@@ -532,7 +532,7 @@ module MasterAmlOfficerStatusPS = struct
   include MK (R)
 end
 
-module PartnerConfigurationPS = struct
+module PartnerConfiguration = struct
   module R = struct
     (* TODO purpose
        this purpose is used 2 times!? *)
@@ -574,7 +574,7 @@ module PartnerConfigurationPS = struct
   include MK (R)
 end
 
-module WadPartnerSignaturePS = struct
+module WadPartnerSignature = struct
   module R = struct
     (* purpose.purpose = TALER_SIGNATURE_MASTER_PARTNER_DETAILS *)
     type r = {
@@ -622,7 +622,7 @@ module WadPartnerSignaturePS = struct
   include MK (R)
 end
 
-module MasterWireFeePS = struct
+module MasterWireFee = struct
   module R = struct
     (* purpose.purpose = TALER_SIGNATURE_MASTER_WIRE_FEES *)
     type r = {
@@ -652,7 +652,7 @@ module MasterWireFeePS = struct
   include MK (R)
 end
 
-module ExchangeKeyValidityPS = struct
+module ExchangeKeyValidity = struct
   module R = struct
     (* purpose.purpose = TALER_SIGNATURE_AUDITOR_EXCHANGE_KEYS *)
     type r = {
@@ -719,7 +719,7 @@ module ExchangeKeyValidityPS = struct
   include MK (R)
 end
 
-module ExchangeKeySetPS = struct
+module ExchangeKeySet = struct
   module R = struct
     (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_KEY_SET *)
     type r = {
@@ -743,7 +743,7 @@ end
 
 (* ### BIN IMPL END ### *)
 
-module WithdrawRequestPS = struct
+module WithdrawRequest = struct
   (* Purpose is #TALER_SIGNATURE_WALLET_RESERVE_WITHDRAW *)
   type t = {
     amount: Amount.t;
@@ -770,7 +770,7 @@ module WithdrawRequestPS = struct
     |> sealr
 end
 
-module WithdrawConfirmationPS = struct
+module WithdrawConfirmation = struct
   (* Purpose is #TALER_SIGNATURE_EXCHANGE_CONFIRM_WITHDRAW.
      Signed by a `struct TALER_ExchangePrivateKeyP` using EdDSA. *)
   type t = {
@@ -792,7 +792,7 @@ module WithdrawConfirmationPS = struct
     |> sealr
 end
 
-module SingleWithdrawRequestPS = struct
+module SingleWithdrawRequest = struct
   (* purpose.purpose = TALER_SIGNATURE_WALLET_RESERVE_WITHDRAW *)
   type t = {
     amount_with_fee: AmountNBO.t;
@@ -801,7 +801,7 @@ module SingleWithdrawRequestPS = struct
   }
 end
 
-module DepositRequestPS = struct
+module DepositRequest = struct
   (* purpose.purpose = TALER_SIGNATURE_WALLET_COIN_DEPOSIT *)
   type t = {
     h_contract_terms: PrivateContractHash.t;
@@ -818,7 +818,7 @@ module DepositRequestPS = struct
   }
 end
 
-module DepositConfirmationPS = struct
+module DepositConfirmation = struct
   (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_DEPOSIT *)
   type t = {
     h_contract_terms: PrivateContractHash.t;
@@ -832,7 +832,7 @@ module DepositConfirmationPS = struct
   }
 end
 
-module RefreshMeltCoinAffirmationPS = struct
+module RefreshMeltCoinAffirmation = struct
   (* purpose.purpose = TALER_SIGNATURE_WALLET_COIN_MELT *)
   type t = {
     session_hash: RefreshCommitmentP.t;
@@ -843,7 +843,7 @@ module RefreshMeltCoinAffirmationPS = struct
   }
 end
 
-module RefreshMeltConfirmationPS = struct
+module RefreshMeltConfirmation = struct
   (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_MELT *)
   type t = {
     session_hash: RefreshCommitmentP.t;
@@ -851,7 +851,7 @@ module RefreshMeltConfirmationPS = struct
   }
 end
 
-module DepositTrackPS = struct
+module DepositTrack = struct
   (* purpose.purpose = TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION *)
   type t = {
     h_contract_terms: PrivateContractHash.t;
@@ -870,7 +870,7 @@ module WireDepositDetailP = struct
   }
 end
 
-module WireDepositDataPS = struct
+module WireDepositData = struct
   (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_WIRE_DEPOSIT *)
   type t = {
     total: AmountNBO.t;
@@ -881,17 +881,17 @@ module WireDepositDataPS = struct
   }
 end
 
-module PaymentResponsePS = struct
+module PaymentResponse = struct
   (* purpose.purpose = TALER_SIGNATURE_MERCHANT_PAYMENT_OK *)
   type t = { h_contract_terms: PrivateContractHash.t }
 end
 
-module ContractPS = struct
+module Contract = struct
   (* purpose.purpose = TALER_SIGNATURE_MERCHANT_CONTRACT *)
   type t = { h_contract_terms: PrivateContractHash.t }
 end
 
-module ConfirmWirePS = struct
+module ConfirmWire = struct
   (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_WIRE *)
   type t = {
     h_wire: MerchantWireHash.t;
@@ -903,7 +903,7 @@ module ConfirmWirePS = struct
   }
 end
 
-module RefundConfirmationPS = struct
+module RefundConfirmation = struct
   (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_REFUND *)
   type t = {
     h_contract_terms: PrivateContractHash.t;
@@ -924,7 +924,7 @@ module DepositTrackPS2 = struct
   }
 end
 
-module RefundRequestPS = struct
+module RefundRequest = struct
   (* purpose.purpose = TALER_SIGNATURE_MERCHANT_REFUND *)
   type t = {
     h_contract_terms: PrivateContractHash.t;
@@ -935,13 +935,13 @@ module RefundRequestPS = struct
   }
 end
 
-module MerchantRefundConfirmationPS = struct
+module MerchantRefundConfirmation = struct
   (* purpose.purpose = TALER_SIGNATURE_MERCHANT_REFUND_OK *)
   (* Hash of the order ID (a string), hashed without the 0-termination. *)
   type t = { h_order_id: Hash_64_cstr.t }
 end
 
-module RecoupRequestPS = struct
+module RecoupRequest = struct
   (* purpose.purpose = TALER_SIGNATURE_WALLET_COIN_RECOUP or TALER_SIGNATURE_WALLET_COIN_RECOUP_REFRESH *)
   type t = {
     h_denom_pub: DenominationHash.t;
@@ -949,7 +949,7 @@ module RecoupRequestPS = struct
   }
 end
 
-module RecoupRefreshConfirmationPS = struct
+module RecoupRefreshConfirmation = struct
   (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_RECOUP_REFRESH *)
   type t = {
     timestamp: TimeAbsoluteNBO.t;
@@ -959,7 +959,7 @@ module RecoupRefreshConfirmationPS = struct
   }
 end
 
-module RecoupConfirmationPS = struct
+module RecoupConfirmation = struct
   (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_RECOUP *)
   type t = {
     timestamp: TimeAbsoluteNBO.t;
@@ -969,7 +969,7 @@ module RecoupConfirmationPS = struct
   }
 end
 
-module DenominationUnknownAffirmationPS = struct
+module DenominationUnknownAffirmation = struct
   (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_AFFIRM_DENOM_UNKNOWN *)
   type t = {
     timestamp: TimeAbsoluteNBO.t;
@@ -977,7 +977,7 @@ module DenominationUnknownAffirmationPS = struct
   }
 end
 
-module DenominationExpiredAffirmationPS = struct
+module DenominationExpiredAffirmation = struct
   (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_GENERIC_DENOMINATIN_EXPIRED *)
   type t = {
     timestamp: TimeAbsoluteNBO.t;
@@ -986,7 +986,7 @@ module DenominationExpiredAffirmationPS = struct
   }
 end
 
-module ReserveCloseConfirmationPS = struct
+module ReserveCloseConfirmation = struct
   (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_RESERVE_CLOSED *)
   type t = {
     timestamp: TimeAbsoluteNBO.t;
@@ -996,7 +996,7 @@ module ReserveCloseConfirmationPS = struct
   }
 end
 
-module CoinLinkSignaturePS = struct
+module CoinLinkSignature = struct
   (* purpose.purpose = TALER_SIGNATURE_WALLET_COIN_LINK *)
   type t = {
     h_denom_pub: DenominationHash.t;
@@ -1006,17 +1006,17 @@ module CoinLinkSignaturePS = struct
   }
 end
 
-module RefreshNonceSignaturePS = struct
+module RefreshNonceSignature = struct
   (* purpose.purpose = TALER_SIGNATURE_WALLET_COIN_LINK *)
   type t = { nonce: PublicRefreshCoinNonceP.t }
 end
 
-module ReserveStatusRequestSignaturePS = struct
+module ReserveStatusRequestSignature = struct
   (* purpose.purpose = TALER_SIGNATURE_RESERVE_STATUS_REQUEST *)
   type t = { request_timestamp: TimeAbsoluteNBO.t }
 end
 
-module ReserveHistoryRequestSignaturePS = struct
+module ReserveHistoryRequestSignature = struct
   (* purpose.purpose = TALER_SIGNATURE_RESERVE_HISTORY_REQUEST *)
   type t = {
     history_fee: AmountNBO.t;
@@ -1024,12 +1024,12 @@ module ReserveHistoryRequestSignaturePS = struct
   }
 end
 
-module PurseStatusRequestSignaturePS = struct
+module PurseStatusRequestSignature = struct
   (* purpose.purpose = TALER_SIGNATURE_PURSE_STATUS_REQUEST *)
   type t = unit
 end
 
-module PurseStatusResponseSignaturePS = struct
+module PurseStatusResponseSignature = struct
   (* purpose.purpose = TALER_SIGNATURE_PURSE_STATUS_RESPONSE *)
   type t = {
     total_purse_amount: AmountNBO.t;
@@ -1041,12 +1041,12 @@ module PurseStatusResponseSignaturePS = struct
   }
 end
 
-module ReserveCloseRequestSignaturePS = struct
+module ReserveCloseRequestSignature = struct
   (* purpose.purpose = TALER_SIGNATURE_WALLET_RESERVE_CLOSE *)
   type t = unit
 end
 
-module PurseRequestSignaturePS = struct
+module PurseRequestSignature = struct
   (* purpose.purpose = TALER_SIGNATURE_WALLET_PURSE_CREATE *)
   type t = {
     purse_expiration: TimeAbsoluteNBO.t;
@@ -1056,7 +1056,7 @@ module PurseRequestSignaturePS = struct
   }
 end
 
-module PurseDepositSignaturePS = struct
+module PurseDepositSignature = struct
   (* purpose.purpose = TALER_SIGNATURE_PURSE_DEPOSIT *)
   type t = {
     coin_contribution: AmountNBO.t;
@@ -1075,7 +1075,7 @@ module PurseDepositSignaturePS2 = struct
   }
 end
 
-module PurseDepositConfirmedSignaturePS = struct
+module PurseDepositConfirmedSignature = struct
   (* purpose.purpose = TALER_SIGNATURE_PURSE_DEPOSIT_CONFIRMED *)
   type t = {
     total_purse_amount: AmountNBO.t;
@@ -1086,7 +1086,7 @@ module PurseDepositConfirmedSignaturePS = struct
   }
 end
 
-module PurseMergeSignaturePS = struct
+module PurseMergeSignature = struct
   (* purpose.purpose = TALER_SIGNATURE_WALLET_PURSE_MERGE *)
   type t = {
     merge_timestamp: TimeAbsoluteNBO.t;
@@ -1094,7 +1094,7 @@ module PurseMergeSignaturePS = struct
   }
 end
 
-module AccountMergeSignaturePS = struct
+module AccountMergeSignature = struct
   (* purpose.purpose = TALER_SIGNATURE_WALLET_ACCOUNT_MERGE *)
   type t = {
     reserve_pub: ReservePublicKeyP.t;
@@ -1107,12 +1107,12 @@ module AccountMergeSignaturePS = struct
   }
 end
 
-module AccountSetupRequestSignaturePS = struct
+module AccountSetupRequestSignature = struct
   (* purpose.purpose = TALER_SIGNATURE_WALLET_ACCOUNT_SETUP *)
   type t = { threshold: AmountNBO.t }
 end
 
-module PurseMergeSuccessSignaturePS = struct
+module PurseMergeSuccessSignature = struct
   (* purpose.purpose = TALER_SIGNATURE_PURSE_MERGE_SUCCESS *)
   type t = {
     reserve_pub: ReservePublicKeyP.t;
@@ -1125,7 +1125,7 @@ module PurseMergeSuccessSignaturePS = struct
   }
 end
 
-module WadDataSignaturePS = struct
+module WadDataSignature = struct
   (* purpose.purpose = TALER_SIGNATURE_WAD_DATA *)
   type t = {
     wad_execution_time: TimeAbsoluteNBO.t;
@@ -1135,7 +1135,7 @@ module WadDataSignaturePS = struct
   }
 end
 
-module P2PFeesPS = struct
+module P2PFees = struct
   (* purpose.purpose = TALER_SIGNATURE_P2P_FEES *)
   type t = {
     start_date: TimeAbsoluteNBO.t;
@@ -1150,7 +1150,7 @@ module P2PFeesPS = struct
   }
 end
 
-module CoinPurseRefundConfirmationPS = struct
+module CoinPurseRefundConfirmation = struct
   (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_PURSE_REFUND *)
   type t = {
     purse_pub: PursePublicKey.t;
@@ -1160,7 +1160,7 @@ module CoinPurseRefundConfirmationPS = struct
   }
 end
 
-module AmlDecisionPS = struct
+module AmlDecision = struct
   (* purpose.purpose = TALER_SIGNATURE_AML_DECISION *)
   type t = {
     h_justification: Hash_64_cstr.t;
@@ -1172,7 +1172,7 @@ module AmlDecisionPS = struct
   }
 end
 
-module ReserveOpenPS = struct
+module ReserveOpen = struct
   (* purpose.purpose = TALER_SIGNATURE_WALLET_RESERVE_OPEN *)
   type t = {
     reserve_payment: AmountNBO.t;
@@ -1182,7 +1182,7 @@ module ReserveOpenPS = struct
   }
 end
 
-module ReserveClosePS = struct
+module ReserveClose = struct
   (* purpose.purpose = TALER_SIGNATURE_WALLET_RESERVE_CLOSE *)
   type t = {
     request_timestamp: TimestampNBO.t;
@@ -1190,7 +1190,7 @@ module ReserveClosePS = struct
   }
 end
 
-module ReserveAttestRequestPS = struct
+module ReserveAttestRequest = struct
   (* purpose.purpose = TALER_SIGNATURE_WALLET_ATTEST_REQUEST *)
   type t = {
     request_timestamp: TimestampNBO.t;
@@ -1198,7 +1198,7 @@ module ReserveAttestRequestPS = struct
   }
 end
 
-module ExchangeAttestPS = struct
+module ExchangeAttest = struct
   (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_RESERVE_ATTEST_DETAILS *)
   type t = {
     attest_timestamp: TimestampNBO.t;