[taler-merchant] branch master updated: fix another EC issue

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 8ead993  fix another EC issue
8ead993 is described below

commit 8ead9935d3898a4095ba8e7d8319bcd4b85b8916
Author: Christian Grothoff <address@hidden>
AuthorDate: Fri Jan 24 17:41:21 2020 +0100

    fix another EC issue
---
 src/lib/merchant_api_proposal.c   | 1 -
 src/lib/merchant_api_tip_pickup.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/merchant_api_proposal.c b/src/lib/merchant_api_proposal.c
index 650de18..73138ad 100644
--- a/src/lib/merchant_api_proposal.c
+++ b/src/lib/merchant_api_proposal.c
@@ -302,7 +302,6 @@ handle_proposal_lookup_finished (void *cls,
                 "Proposal lookup failed with HTTP status code %u\n",
                 (unsigned int) response_code);
     GNUNET_break (0);
-
     plo->cb (plo->cb_cls,
              response_code,
              json,
diff --git a/src/lib/merchant_api_tip_pickup.c 
b/src/lib/merchant_api_tip_pickup.c
index 683c7d0..668eb4b 100644
--- a/src/lib/merchant_api_tip_pickup.c
+++ b/src/lib/merchant_api_tip_pickup.c
@@ -136,7 +136,7 @@ check_ok (struct TALER_MERCHANT_TipPickupOperation *tpo,
     }
     tpo->cb (tpo->cb_cls,
              MHD_HTTP_OK,
-             TALER_JSON_get_error_code (json),
+             TALER_EC_NONE,
              &reserve_pub,
              ja_len,
              reserve_sigs,

-- 
To stop receiving notification emails like this one, please contact
address@hidden.