summaryrefslogtreecommitdiff
path: root/api-common.rst
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-07-20 03:41:07 +0200
committerFlorian Dold <florian.dold@gmail.com>2017-07-20 03:41:07 +0200
commita76dc6a4c66ed9ecce34ba84e6bfe2b910660b2c (patch)
treebcc749fd65545aef2a5c8f569249ced6bf9dae3e /api-common.rst
parent5d61b8a6a70beb1dcbdc32f56fc949ceef4be718 (diff)
downloaddocs-a76dc6a4c66ed9ecce34ba84e6bfe2b910660b2c.tar.gz
docs-a76dc6a4c66ed9ecce34ba84e6bfe2b910660b2c.tar.bz2
docs-a76dc6a4c66ed9ecce34ba84e6bfe2b910660b2c.zip
fix outdated fields and names
Diffstat (limited to 'api-common.rst')
-rw-r--r--api-common.rst23
1 files changed, 8 insertions, 15 deletions
diff --git a/api-common.rst b/api-common.rst
index 1e7cbf8e..b9acd5cc 100644
--- a/api-common.rst
+++ b/api-common.rst
@@ -481,11 +481,10 @@ within the
* purpose.purpose = TALER_SIGNATURE_WALLET_COIN_DEPOSIT
*/
struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
- struct GNUNET_HashCode h_proposal_data;
+ struct GNUNET_HashCode h_contract_terms;
struct GNUNET_HashCode h_wire;
struct GNUNET_TIME_AbsoluteNBO timestamp;
struct GNUNET_TIME_AbsoluteNBO refund_deadline;
- uint64_t transaction_id;
struct TALER_AmountNBO amount_with_fee;
struct TALER_AmountNBO deposit_fee;
struct TALER_MerchantPublicKeyP merchant;
@@ -500,9 +499,8 @@ within the
* purpose.purpose = TALER_SIGNATURE_WALLET_CONFIRM_DEPOSIT
*/
struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
- struct GNUNET_HashCode h_proposal_data;
+ struct GNUNET_HashCode h_contract_terms;
struct GNUNET_HashCode h_wire;
- uint64_t transaction_id;
struct GNUNET_TIME_AbsoluteNBO timestamp;
struct GNUNET_TIME_AbsoluteNBO refund_deadline;
struct TALER_AmountNBO amount_without_fee;
@@ -615,9 +613,8 @@ within the
* purpose.purpose = TALER_SIGNATURE_MASTER_SEPA_DETAILS || TALER_SIGNATURE_MASTER_TEST_DETAILS
*/
struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
- struct GNUNET_HashCode h_proposal_data;
+ struct GNUNET_HashCode h_contract_terms;
struct GNUNET_HashCode h_wire;
- uint64_t transaction_id;
struct TALER_MerchantPublicKeyP merchant;
struct TALER_CoinSpendPublicKeyP coin_pub;
};
@@ -626,9 +623,8 @@ within the
.. sourcecode:: c
struct TALER_WireDepositDetailP {
- struct GNUNET_HashCode h_proposal_data;
+ struct GNUNET_HashCode h_contract_terms;
struct GNUNET_TIME_AbsoluteNBO execution_time;
- uint64_t transaction_id;
struct TALER_CoinSpendPublicKeyP coin_pub;
struct TALER_AmountNBO deposit_value;
struct TALER_AmountNBO deposit_fee;
@@ -679,7 +675,7 @@ within the
* purpose.purpose = TALER_SIGNATURE_MERCHANT_PAYMENT_OK
*/
struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
- struct GNUNET_HashCode h_proposal_data;
+ struct GNUNET_HashCode h_contract_terms;
};
.. _TALER_ContractPS:
@@ -690,10 +686,9 @@ within the
* purpose.purpose = TALER_SIGNATURE_MERCHANT_CONTRACT
*/
struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
- uint64_t transaction_id;
struct TALER_AmountNBO total_amount;
struct TALER_AmountNBO max_fee;
- struct GNUNET_HashCode h_proposal_data;
+ struct GNUNET_HashCode h_contract_terms;
struct TALER_MerchantPublicKeyP merchant_pub;
};
@@ -706,10 +701,9 @@ within the
*/
struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
struct GNUNET_HashCode h_wire;
- struct GNUNET_HashCode h_proposal_data;
+ struct GNUNET_HashCode h_contract_terms;
struct TALER_WireTransferIdentifierRawP wtid;
struct TALER_CoinSpendPublicKeyP coin_pub;
- uint64_t transaction_id;
struct GNUNET_TIME_AbsoluteNBO execution_time;
struct TALER_AmountNBO coin_contribution;
};
@@ -722,8 +716,7 @@ within the
* purpose.purpose = TALER_SIGNATURE_MERCHANT_REFUND
*/
struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
- struct GNUNET_HashCode h_proposal_data;
- uint64_t transaction_id;
+ struct GNUNET_HashCode h_contract_terms;
struct TALER_CoinSpendPublicKeyP coin_pub;
struct TALER_MerchantPublicKeyP merchant;
uint64_t rtransaction_id;