diff options
| author | Christian Grothoff <christian@grothoff.org> | 2017-06-04 01:06:09 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2017-06-04 01:06:09 +0200 |
| commit | d3522a172d544cf759258972fa9de14dfb1e2b3f (patch) | |
| tree | 5d2cdde6bf2605c909c4502b1ad95a3b2d7f442a /src/backend/taler-merchant-httpd_proposal.c | |
| parent | 0878d31f69185cf66d58eea98589948fa8bebe67 (diff) | |
| parent | fc6ee7d0f6bb4c88f969baebc9a677d77cbc386e (diff) | |
| download | merchant-d3522a172d544cf759258972fa9de14dfb1e2b3f.tar.gz merchant-d3522a172d544cf759258972fa9de14dfb1e2b3f.tar.bz2 merchant-d3522a172d544cf759258972fa9de14dfb1e2b3f.zip | |
fix merge issue: proposal_data -> contract_terms rename
Diffstat (limited to 'src/backend/taler-merchant-httpd_proposal.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd_proposal.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/taler-merchant-httpd_proposal.c b/src/backend/taler-merchant-httpd_proposal.c index 36d174ac..fa8251c3 100644 --- a/src/backend/taler-merchant-httpd_proposal.c +++ b/src/backend/taler-merchant-httpd_proposal.c @@ -296,7 +296,7 @@ proposal_put (struct MHD_Connection *connection, /* fetch timestamp from order */ if (GNUNET_OK != - db->insert_proposal_data (db->cls, + db->insert_contract_terms (db->cls, order_id, &mi->pubkey, timestamp, @@ -405,7 +405,7 @@ MH_handler_proposal_lookup (struct TMH_RequestHandler *rh, const char *order_id; const char *instance; int res; - json_t *proposal_data; + json_t *contract_terms; struct MerchantInstance *mi; instance = MHD_lookup_connection_value (connection, @@ -427,8 +427,8 @@ MH_handler_proposal_lookup (struct TMH_RequestHandler *rh, TALER_EC_PARAMETER_MISSING, "order_id"); - res = db->find_proposal_data (db->cls, - &proposal_data, + res = db->find_contract_terms (db->cls, + &contract_terms, order_id, &mi->pubkey); if (GNUNET_NO == res) @@ -443,7 +443,7 @@ MH_handler_proposal_lookup (struct TMH_RequestHandler *rh, return TMH_RESPONSE_reply_json (connection, - proposal_data, + contract_terms, MHD_HTTP_OK); |