summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2017-02-03 18:26:47 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2017-02-03 18:26:47 +0100
commita60c5e9c97ea72428d4f61af3ea8caf1d74f2dcb (patch)
treecdf4e2abfc55f6930a0be4ef634ad34859f8c019
parentd2302da33223a265dddf50d24c69ba9d5a057827 (diff)
downloadexchange-a60c5e9c97ea72428d4f61af3ea8caf1d74f2dcb.tar.gz
exchange-a60c5e9c97ea72428d4f61af3ea8caf1d74f2dcb.tar.bz2
exchange-a60c5e9c97ea72428d4f61af3ea8caf1d74f2dcb.zip
Renaming's first steps.
-rw-r--r--src/include/taler_error_codes.h13
-rw-r--r--src/include/taler_signatures.h8
2 files changed, 10 insertions, 11 deletions
diff --git a/src/include/taler_error_codes.h b/src/include/taler_error_codes.h
index 5bd9bde4c..b0e337325 100644
--- a/src/include/taler_error_codes.h
+++ b/src/include/taler_error_codes.h
@@ -1139,23 +1139,22 @@ enum TALER_ErrorCode
/**
* The backend encountered an error while trying to store the
- * pair <contract, h_contract> into the database.
+ * pair <proposal_data, h_transaction_id> into the database.
* The response is provided with HTTP status code MHD_HTTP_INTERNAL_SERVER_ERROR.
*/
- TALER_EC_MAP_IN_STORE_DB_ERROR = 2501,
+ TALER_EC_PROPOSAL_STORE_DB_ERROR = 2501,
/**
* The backend encountered an error while trying to retrieve the
- * contract from database. Likely to be an internal error.
+ * proposal data from database. Likely to be an internal error.
*/
- TALER_EC_MAP_OUT_GET_FROM_DB_ERROR = 2502,
+ TALER_EC_PROPOSAL_LOOKUP_DB_ERROR = 2502,
/**
- * The backend encountered an error while trying to retrieve the
- * contract from database. Likely to be an internal error.
+ * The proposal being looked up is not found on this merchant.
*/
- TALER_EC_MAP_OUT_CONTRACT_UNKNOWN = 2503,
+ TALER_EC_PROPOSAL_LOOKUP_NOT_FOUND = 2503,
/* ********** /test API error codes ************* */
diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h
index 00e5c6eaf..d7b2e91d5 100644
--- a/src/include/taler_signatures.h
+++ b/src/include/taler_signatures.h
@@ -1031,11 +1031,11 @@ struct TALER_WireDepositDataPS
/**
* The contract sent by the merchant to the wallet.
*/
-struct TALER_ContractPS
+struct TALER_ProposalDatatPS
{
/**
- * Purpose header for the signature over the contract with
- * purpose #TALER_SIGNATURE_MERCHANT_CONTRACT.
+ * Purpose header for the signature over the proposal data
+ * with purpose #TALER_SIGNATURE_MERCHANT_CONTRACT.
*/
struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
@@ -1043,7 +1043,7 @@ struct TALER_ContractPS
* Hash of the JSON contract in UTF-8 including 0-termination,
* using JSON_COMPACT | JSON_SORT_KEYS
*/
- struct GNUNET_HashCode h_contract;
+ struct GNUNET_HashCode h_proposal_data;
};
/**