diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/taler_exchange_service.h | 4 | ||||
-rw-r--r-- | src/include/taler_exchangedb_plugin.h | 26 | ||||
-rw-r--r-- | src/include/taler_signatures.h | 12 |
3 files changed, 18 insertions, 24 deletions
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h index 04f94e57..794051e2 100644 --- a/src/include/taler_exchange_service.h +++ b/src/include/taler_exchange_service.h @@ -95,14 +95,14 @@ struct TALER_EXCHANGE_DenomPublicKey /** * Timestamp indicating when coins of this denomination become invalid. */ - struct GNUNET_TIME_Absolute deposit_valid_until; + struct GNUNET_TIME_Absolute expire_deposit; /** * When do signatures with this denomination key become invalid? * After this point, these signatures cannot be used in (legal) * disputes anymore, as the Exchange is then allowed to destroy its side * of the evidence. @e expire_legal is expected to be significantly - * larger than @e expire_spend (by a year or more). + * larger than @e expire_deposit (by a year or more). */ struct GNUNET_TIME_Absolute expire_legal; diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h index e364d6b9..ebcfe375 100644 --- a/src/include/taler_exchangedb_plugin.h +++ b/src/include/taler_exchangedb_plugin.h @@ -205,8 +205,7 @@ struct TALER_EXCHANGEDB_ReserveHistory * merchant must either use a different public key or a different * transaction ID for the two transactions. The same coin must not * be used twice at the same merchant for the same transaction - * (as determined by transaction ID). (Note: we might want to - * fix #3819 and include at least h_contract as well.) + * (as determined by transaction ID). */ struct TALER_EXCHANGEDB_Deposit { @@ -317,12 +316,12 @@ struct TALER_EXCHANGEDB_Refund struct TALER_CoinPublicInfo coin; /** - * Public key of the merchant. + * Public key of the merchant. */ struct TALER_MerchantPublicKeyP merchant_pub; - + /** - * Signature from the merchant affirming the refund. + * Signature from the merchant affirming the refund. */ struct TALER_MerchantSignatureP merchant_sig; @@ -338,7 +337,7 @@ struct TALER_EXCHANGEDB_Refund * refunded. */ uint64_t transaction_id; - + /** * Merchant-generated REFUND transaction ID to detect duplicate * refunds. @@ -718,36 +717,31 @@ struct TALER_EXCHANGEDB_Plugin * Connect to the db if the connection does not exist yet. * * @param cls the @e cls of this struct with the plugin-specific state - * @param temporary #GNUNET_YES to use a temporary schema; #GNUNET_NO to use the - * database default one * @param the database connection, or NULL on error */ struct TALER_EXCHANGEDB_Session * - (*get_session) (void *cls, - int temporary); + (*get_session) (void *cls); /** - * Drop the temporary taler schema. This is only useful for testcases. + * Drop the Taler tables. This should only be used in testcases. * * @param cls the @e cls of this struct with the plugin-specific state * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure */ int - (*drop_temporary) (void *cls, - struct TALER_EXCHANGEDB_Session *db); + (*drop_tables) (void *cls, + struct TALER_EXCHANGEDB_Session *db); /** * Create the necessary tables if they are not present * * @param cls the @e cls of this struct with the plugin-specific state - * @param temporary should we use a temporary schema * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure */ int - (*create_tables) (void *cls, - int temporary); + (*create_tables) (void *cls); /** diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h index f1586aa8..4ce57b0f 100644 --- a/src/include/taler_signatures.h +++ b/src/include/taler_signatures.h @@ -659,18 +659,18 @@ struct TALER_DenominationKeyValidityPS * exchange will refuse transactions involving this key as it will * "drop" the table with double-spending information (shortly after) * this time. Note that wallets should refresh coins significantly - * before this time to be on the safe side. @e expire_spend must be + * before this time to be on the safe side. @e expire_deposit must be * significantly larger than @e expire_withdraw (by months or even * years). */ - struct GNUNET_TIME_AbsoluteNBO expire_spend; + struct GNUNET_TIME_AbsoluteNBO expire_deposit; /** * When do signatures with this denomination key become invalid? * After this point, these signatures cannot be used in (legal) * disputes anymore, as the Exchange is then allowed to destroy its side * of the evidence. @e expire_legal is expected to be significantly - * larger than @e expire_spend (by a year or more). + * larger than @e expire_deposit (by a year or more). */ struct GNUNET_TIME_AbsoluteNBO expire_legal; @@ -762,18 +762,18 @@ struct TALER_ExchangeKeyValidityPS * exchange will refuse transactions involving this key as it will * "drop" the table with double-spending information (shortly after) * this time. Note that wallets should refresh coins significantly - * before this time to be on the safe side. @e expire_spend must be + * before this time to be on the safe side. @e expire_deposit must be * significantly larger than @e expire_withdraw (by months or even * years). */ - struct GNUNET_TIME_AbsoluteNBO expire_spend; + struct GNUNET_TIME_AbsoluteNBO expire_deposit; /** * When do signatures with this denomination key become invalid? * After this point, these signatures cannot be used in (legal) * disputes anymore, as the Exchange is then allowed to destroy its side * of the evidence. @e expire_legal is expected to be significantly - * larger than @e expire_spend (by a year or more). + * larger than @e expire_deposit (by a year or more). */ struct GNUNET_TIME_AbsoluteNBO expire_legal; |