diff options
| author | Christian Blättler <blatc2@bfh.ch> | 2024-05-11 16:04:53 +0200 |
|---|---|---|
| committer | Christian Blättler <blatc2@bfh.ch> | 2024-05-11 16:04:53 +0200 |
| commit | 44ef77be8ce3ae7bb89f3c10a4f864981f1d0481 (patch) | |
| tree | f92a257694cfaa848f9a6f5a0e88ef71bb5d31e1 /src | |
| parent | d1461b2485cb8a633e93f4ed59c560619f08af72 (diff) | |
misc
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/taler-merchant-httpd_post-orders-ID-pay.c | 1 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-post-orders.c | 1 | ||||
| -rw-r--r-- | src/backenddb/merchant-0006.sql | 2 | ||||
| -rw-r--r-- | src/backenddb/pg_insert_token_family_key.c | 1 |
4 files changed, 2 insertions, 3 deletions
diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c index c56fa63b..d3103725 100644 --- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c +++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c @@ -2942,6 +2942,7 @@ phase_parse_wallet_data (struct PayContext *pc) struct GNUNET_HashCode h_outputs_req; pc->choice_index = -1; + // TODO: Ensure that wallet_data must be set for contracts with choices. if (NULL == pc->wallet_data) { pc->phase = PP_CHECK_CONTRACT; diff --git a/src/backend/taler-merchant-httpd_private-post-orders.c b/src/backend/taler-merchant-httpd_private-post-orders.c index 02a19603..9eb63516 100644 --- a/src/backend/taler-merchant-httpd_private-post-orders.c +++ b/src/backend/taler-merchant-httpd_private-post-orders.c @@ -1541,7 +1541,6 @@ set_token_family (struct OrderContext *oc, GNUNET_free (key_details.token_family.slug); { - struct TALER_MerchantContractTokenFamilyKey key; if (NULL == family) diff --git a/src/backenddb/merchant-0006.sql b/src/backenddb/merchant-0006.sql index 67502a6f..c0059b18 100644 --- a/src/backenddb/merchant-0006.sql +++ b/src/backenddb/merchant-0006.sql @@ -30,7 +30,7 @@ ALTER TABLE merchant_contract_terms ADD COLUMN choice_index INT2 DEFAULT NULL; COMMENT ON COLUMN merchant_contract_terms.choice_index - IS 'Index of selected choice. Refers the the `choices` array in the contract terms. NULL for contracts without choices.'; + IS 'Index of selected choice. Refers to the `choices` array in the contract terms. NULL for contracts without choices.'; -- Complete transaction COMMIT; diff --git a/src/backenddb/pg_insert_token_family_key.c b/src/backenddb/pg_insert_token_family_key.c index 95b5a852..b6602931 100644 --- a/src/backenddb/pg_insert_token_family_key.c +++ b/src/backenddb/pg_insert_token_family_key.c @@ -53,7 +53,6 @@ TMH_PG_insert_token_family_key (void *cls, &pub_hash); break; case GNUNET_CRYPTO_BSA_INVALID: - /* case listed to make compilers happy */ return GNUNET_DB_STATUS_HARD_ERROR; } |