generate taler_pay_uri in favor of the trigger-pay mechanism

3 files changed, 9 insertions, 9 deletions

diff --git a/src/lib/merchant_api_check_payment.c b/src/lib/merchant_api_check_payment.c
index 4605f476..87a74ea6 100644
--- a/src/lib/merchant_api_check_payment.c
+++ b/src/lib/merchant_api_check_payment.c
@@ -111,11 +111,11 @@ handle_check_payment_finished (void *cls,
 
   if (! json_boolean_value (json_object_get (json, "paid")))
   {
-    const char *fallback_request_payment_url = json_string_value (json_object_get (json, "fallback_request_payment_url"));
-    if (NULL == fallback_request_payment_url)
+    const char *taler_pay_uri = json_string_value (json_object_get (json, "taler_pay_uri"));
+    if (NULL == taler_pay_uri)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "no fallback_request_payment_url in unpaid check-payment response\n");
+                  "no taler_pay_uri in unpaid check-payment response\n");
       GNUNET_break_op (0);
       cpo->cb (cpo->cb_cls,
                0,
@@ -131,7 +131,7 @@ handle_check_payment_finished (void *cls,
                GNUNET_NO,
                GNUNET_NO,
                &refund_amount,
-               fallback_request_payment_url);
+               taler_pay_uri);
     }
     TALER_MERCHANT_check_payment_cancel (cpo);
     return;
diff --git a/src/lib/test_merchant_api_twisted.c b/src/lib/test_merchant_api_twisted.c
index 9646fd16..43f3ef6f 100644
--- a/src/lib/test_merchant_api_twisted.c
+++ b/src/lib/test_merchant_api_twisted.c
@@ -303,7 +303,7 @@ run (void *cls,
 
     TALER_TESTING_cmd_delete_object ("hack-check-payment-0",
                                      PROXY_MERCHANT_CONFIG_FILE,
-                                     "fallback_request_payment_url"),
+                                     "taler_pay_uri"),
     TALER_TESTING_cmd_check_payment
       ("check-payment-fail-invalid",
        twister_merchant_url,
diff --git a/src/lib/testing_api_cmd_pay.c b/src/lib/testing_api_cmd_pay.c
index a9947a50..aafcf253 100644
--- a/src/lib/testing_api_cmd_pay.c
+++ b/src/lib/testing_api_cmd_pay.c
@@ -316,8 +316,8 @@ check_payment_cleanup (void *cls,
  *        refunded (not refunded).
  * @param refund_amount the amount that was refunded to this
  *        contract.
- * @param fallback_request_payment_url URL where the payment has to be
- *        addressed.
+ * @param taler_pay_uri the URI that instructs the wallets to process
+ *                      the payment
  */
 static void
 check_payment_cb (void *cls,
@@ -326,7 +326,7 @@ check_payment_cb (void *cls,
                   int paid,
                   int refunded,
                   struct TALER_Amount *refund_amount,
-                  const char *fallback_request_payment_url)
+                  const char *taler_pay_uri)
 {
   struct CheckPaymentState *cps = cls;
 
@@ -341,7 +341,7 @@ check_payment_cb (void *cls,
               paid);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "check payment: url: %s\n",
-              fallback_request_payment_url);
+              taler_pay_uri);
 
   if (paid != cps->expect_paid)
     TALER_TESTING_FAIL (cps->is);