[GNUnet-SVN] [taler-merchant] branch master updated: simplify logic

[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 7d4b310  simplify logic
7d4b310 is described below

commit 7d4b310acd6206718f92a596a91e1d536777f9fc
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Dec 10 00:16:21 2017 +0100

    simplify logic
---
 src/lib/merchant_api_track_transaction.c | 33 +++++---------------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/src/lib/merchant_api_track_transaction.c 
b/src/lib/merchant_api_track_transaction.c
index 25a88b7..6b68016 100644
--- a/src/lib/merchant_api_track_transaction.c
+++ b/src/lib/merchant_api_track_transaction.c
@@ -65,26 +65,6 @@ struct TALER_MERCHANT_TrackTransactionHandle
   struct GNUNET_CURL_Context *ctx;
 };
 
-/**
- * Handle #MHD_HTTP_OK response to /track/transaction.
- * Parse @a json and if successful call the callback in @a tdo.
- *
- * @param tdo handle of the operation
- * @param json json to parse
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
- */
-static int
-parse_track_transaction_ok (struct TALER_MERCHANT_TrackTransactionHandle *tdo,
-                            const json_t *json)
-{
-  tdo->cb (tdo->cb_cls,
-           MHD_HTTP_OK,
-          TALER_EC_NONE,
-           json);
-
-  return GNUNET_OK;
-}
-
 
 /**
  * Function called when we're done processing the
@@ -107,14 +87,11 @@ handle_track_transaction_finished (void *cls,
   case 0:
     break;
   case MHD_HTTP_OK:
-    if (GNUNET_OK ==
-        parse_track_transaction_ok (tdo,
-                                    json))
-    {
-      TALER_MERCHANT_track_transaction_cancel (tdo);
-      return;
-    }
-    response_code = 0;
+    tdo->cb (tdo->cb_cls,
+             MHD_HTTP_OK,
+             TALER_EC_NONE,
+             json);
+    TALER_MERCHANT_track_transaction_cancel (tdo);
     break;
   case MHD_HTTP_ACCEPTED:
     {

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