[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-api] branch master updated: start using new terminol
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-api] branch master updated: start using new terminology, remove transaction_id |
Date: |
Tue, 07 Feb 2017 15:34:00 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository api.
The following commit(s) were added to refs/heads/master by this push:
new e420787 start using new terminology, remove transaction_id
e420787 is described below
commit e4207873a67d913a6994c9fdecebca3726e9425d
Author: Florian Dold <address@hidden>
AuthorDate: Tue Feb 7 15:31:55 2017 +0100
start using new terminology, remove transaction_id
---
api/api-common.rst | 16 ++++++++--------
api/api-error.rst | 2 +-
api/api-exchange.rst | 8 ++++----
api/api-merchant.rst | 4 ++--
docs/example-essay-store.rst | 8 ++++----
docs/integration-merchant.rst | 4 ++--
6 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/api/api-common.rst b/api/api-common.rst
index defabe6..e8e41fe 100644
--- a/api/api-common.rst
+++ b/api/api-common.rst
@@ -481,7 +481,7 @@ within the
* purpose.purpose = TALER_SIGNATURE_WALLET_COIN_DEPOSIT
*/
struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
- struct GNUNET_HashCode h_contract;
+ struct GNUNET_HashCode h_proposal_data;
struct GNUNET_HashCode h_wire;
struct GNUNET_TIME_AbsoluteNBO timestamp;
struct GNUNET_TIME_AbsoluteNBO refund_deadline;
@@ -500,7 +500,7 @@ within the
* purpose.purpose = TALER_SIGNATURE_WALLET_CONFIRM_DEPOSIT
*/
struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
- struct GNUNET_HashCode h_contract;
+ struct GNUNET_HashCode h_proposal_data;
struct GNUNET_HashCode h_wire;
uint64_t transaction_id GNUNET_PACKED;
struct GNUNET_TIME_AbsoluteNBO timestamp;
@@ -593,7 +593,7 @@ within the
* purpose.purpose = TALER_SIGNATURE_MASTER_SEPA_DETAILS ||
TALER_SIGNATURE_MASTER_TEST_DETAILS
*/
struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
- struct GNUNET_HashCode h_contract;
+ struct GNUNET_HashCode h_proposal_data;
struct GNUNET_HashCode h_wire;
uint64_t transaction_id;
struct TALER_MerchantPublicKeyP merchant;
@@ -605,7 +605,7 @@ within the
* to generate the signature for /track/transfer signatures.
*/
struct TALER_WireDepositDetailP {
- struct GNUNET_HashCode h_contract;
+ struct GNUNET_HashCode h_proposal_data;
struct GNUNET_TIME_AbsoluteNBO execution_time;
uint64_t transaction_id GNUNET_PACKED;
struct TALER_CoinSpendPublicKeyP coin_pub;
@@ -655,7 +655,7 @@ within the
* purpose.purpose = TALER_SIGNATURE_MERCHANT_PAYMENT_OK
*/
struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
- struct GNUNET_HashCode h_contract;
+ struct GNUNET_HashCode h_proposal_data;
};
@@ -670,7 +670,7 @@ within the
uint64_t transaction_id;
struct TALER_AmountNBO total_amount;
struct TALER_AmountNBO max_fee;
- struct GNUNET_HashCode h_contract;
+ struct GNUNET_HashCode h_proposal_data;
struct TALER_MerchantPublicKeyP merchant_pub;
};
@@ -680,7 +680,7 @@ within the
*/
struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
struct GNUNET_HashCode h_wire;
- struct GNUNET_HashCode h_contract;
+ struct GNUNET_HashCode h_proposal_data;
struct TALER_WireTransferIdentifierRawP wtid;
struct TALER_CoinSpendPublicKeyP coin_pub;
uint64_t transaction_id;
@@ -696,7 +696,7 @@ within the
* purpose.purpose = TALER_SIGNATURE_MERCHANT_REFUND
*/
struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
- struct GNUNET_HashCode h_contract GNUNET_PACKED;
+ struct GNUNET_HashCode h_proposal_data GNUNET_PACKED;
uint64_t transaction_id GNUNET_PACKED;
struct TALER_CoinSpendPublicKeyP coin_pub;
struct TALER_MerchantPublicKeyP merchant;
diff --git a/api/api-error.rst b/api/api-error.rst
index cf107b1..147d543 100644
--- a/api/api-error.rst
+++ b/api/api-error.rst
@@ -1140,7 +1140,7 @@ The following list shows error codes defined in
/**
* The backend encountered an error while trying to store the
- * pair <contract, h_contract> into the database.
+ * pair <contract, h_proposal_data> into the database.
* The response is provided with HTTP status code
MHD_HTTP_INTERNAL_SERVER_ERROR.
*/
TALER_EC_MAP_IN_STORE_DB_ERROR = 2501,
diff --git a/api/api-exchange.rst b/api/api-exchange.rst
index a0c2368..74cc9a3 100644
--- a/api/api-exchange.rst
+++ b/api/api-exchange.rst
@@ -507,7 +507,7 @@ denomination.
// SHA-512 hash of the contact of the merchant with the customer.
Further
// details are never disclosed to the exchange.
- H_contract: HashCode;
+ h_proposal_data: HashCode;
// `coin's public key <eddsa-coin-pub>`_, both ECDHE and EdDSA.
coin_pub: CoinPublicKey;
@@ -985,7 +985,7 @@ typically also view the balance.)
interface TrackTransferDetail {
// SHA-512 hash of the contact of the merchant with the customer.
- H_contract: HashCode;
+ h_proposal_data: HashCode;
// 64-bit transaction id for the transaction between merchant and
// customer
@@ -1032,7 +1032,7 @@ typically also view the balance.)
H_wire: HashCode;
// SHA-512 hash of the contact of the merchant with the customer.
- H_contract: HashCode;
+ h_proposal_data: HashCode;
// coin's public key, both ECDHE and EdDSA.
coin_pub: CoinPublicKey;
@@ -1132,7 +1132,7 @@ Refunds
refund_fee: Amount;
// SHA-512 hash of the contact of the merchant with the customer.
- H_contract: HashCode;
+ h_proposal_data: HashCode;
// coin's public key, both ECDHE and EdDSA.
coin_pub: CoinPublicKey;
diff --git a/api/api-merchant.rst b/api/api-merchant.rst
index 92a43dc..3fafcc7 100644
--- a/api/api-merchant.rst
+++ b/api/api-merchant.rst
@@ -269,7 +269,7 @@ The following API are made available by the merchant's
`backend` to the merchant
merchant_sig: EddsaSignature;
// Contract's hash being signed over
- h_contract: HashCode;
+ h_proposal_data: HashCode;
}
.. http:get:: /track/transfer
@@ -472,7 +472,7 @@ The following API are made available by the merchant's
`backend` to the merchant
transaction_id: number;
// Hashcode of the relevant contract
- h_contract: HashCode;
+ h_proposal_data: HashCode;
// Exchange's base URL
exchange: string;
diff --git a/docs/example-essay-store.rst b/docs/example-essay-store.rst
index 14cb31d..c76ce51 100644
--- a/docs/example-essay-store.rst
+++ b/docs/example-essay-store.rst
@@ -355,8 +355,8 @@ case and reconstructs the contract.
contract_resp = sign_contract(restored_contract)
# Return error if uuid mismatch with the hashcode coming from the backend
- if contract_resp["H_contract"] != hc:
- e = jsonify(error="contract mismatch", was=hc,
expected=contract_resp["H_contract"])
+ if contract_resp["h_proposal_data"] != hc:
+ e = jsonify(error="contract mismatch", was=hc,
expected=contract_resp["h_proposal_data"])
return e, 400
# We save the article's name in the state since after
@@ -576,11 +576,11 @@ to the wallet. See below the main steps of its
implementation.
return e, 400
# Pick the contract's hashcode from deposit permission
- hc = deposit_permission.get("H_contract")
+ hc = deposit_permission.get("h_proposal_data")
# Return error if no hashcode was found
if hc is None:
- e = jsonify(error="malformed deposit permission", hint="H_contract
missing")
+ e = jsonify(error="malformed deposit permission",
hint="h_proposal_data missing")
return e, 400
# Get a handle to the state for this contract, using the
diff --git a/docs/integration-merchant.rst b/docs/integration-merchant.rst
index 7cf9304..5318750 100644
--- a/docs/integration-merchant.rst
+++ b/docs/integration-merchant.rst
@@ -245,8 +245,8 @@ parameters to the wallet, which will:
if 200 == response.status_code:
# Here we pick the article name from the state defined at
# fulfillment time.
- # deposit_permission['H_contract'] is the contract hashcode
- payed_article =
session[deposit_permission['H_contract']]['article_name']
+ # deposit_permission['h_proposal_data'] is the contract hashcode
+ payed_article =
session[deposit_permission['h_proposal_data']]['article_name']
session['payed_articles'].append(payed_article)
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-api] branch master updated: start using new terminology, remove transaction_id,
gnunet <=