[GNUnet-SVN] [taler-exchange] 07/07: move reply_transfer_pending to where it belongs

[gnunet]

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

grothoff pushed a commit to branch master
in repository exchange.

commit 247f82c088dd1575709a676ab87555514fa6445e
Author: Christian Grothoff <address@hidden>
AuthorDate: Mon Jun 19 21:08:40 2017 +0200

    move reply_transfer_pending to where it belongs
---
 src/exchange/taler-exchange-httpd_db.c             |  3 ++-
 src/exchange/taler-exchange-httpd_db.h             |  2 +-
 src/exchange/taler-exchange-httpd_responses.c      | 21 +-------------------
 src/exchange/taler-exchange-httpd_responses.h      | 15 +-------------
 .../taler-exchange-httpd_track_transaction.c       | 23 ++++++++++++++++++++--
 5 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/src/exchange/taler-exchange-httpd_db.c 
b/src/exchange/taler-exchange-httpd_db.c
index e7be6af..9eeda6e 100644
--- a/src/exchange/taler-exchange-httpd_db.c
+++ b/src/exchange/taler-exchange-httpd_db.c
@@ -15,7 +15,7 @@
 */
 /**
  * @file taler-exchange-httpd_db.c
- * @brief High-level (transactional-layer) database operations for the 
exchange.
+ * @brief Generic database operations for the exchange.
  * @author Christian Grothoff
  */
 #include "platform.h"
@@ -116,6 +116,7 @@ TEH_DB_run_transaction (struct MHD_Connection *connection,
  * @param[out] ret where the resulting total is to be stored
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on errors
  */
+// FIXME: maybe move to another module, i.e. exchangedb???
 int
 TEH_DB_calculate_transaction_list_totals (struct 
TALER_EXCHANGEDB_TransactionList *tl,
                                          const struct TALER_Amount *off,
diff --git a/src/exchange/taler-exchange-httpd_db.h 
b/src/exchange/taler-exchange-httpd_db.h
index a61f932..7e342c8 100644
--- a/src/exchange/taler-exchange-httpd_db.h
+++ b/src/exchange/taler-exchange-httpd_db.h
@@ -76,7 +76,7 @@ TEH_DB_run_transaction (struct MHD_Connection *connection,
  * @param[out] ret where the resulting total is to be stored
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on errors
  */
-// FIXME: maybe move to another module?
+// FIXME: maybe move to another module, i.e. exchangedb???
 int
 TEH_DB_calculate_transaction_list_totals (struct 
TALER_EXCHANGEDB_TransactionList *tl,
                                          const struct TALER_Amount *off,
diff --git a/src/exchange/taler-exchange-httpd_responses.c 
b/src/exchange/taler-exchange-httpd_responses.c
index 85575b6..c31c248 100644
--- a/src/exchange/taler-exchange-httpd_responses.c
+++ b/src/exchange/taler-exchange-httpd_responses.c
@@ -15,7 +15,7 @@
 */
 /**
  * @file taler-exchange-httpd_responses.c
- * @brief API for generating the various replies of the exchange; these
+ * @brief API for generating genric replies of the exchange; these
  *        functions are called TEH_RESPONSE_reply_ and they generate
  *        and queue MHD response objects for a given connection.
  * @author Florian Dold
@@ -899,23 +899,4 @@ TEH_RESPONSE_reply_transaction_unknown (struct 
MHD_Connection *connection,
 }
 
 
-/**
- * A merchant asked for details about a deposit, but
- * we did not execute the deposit yet. Generate a 202 reply.
- *
- * @param connection connection to the client
- * @param planned_exec_time planned execution time
- * @return MHD result code
- */
-int
-TEH_RESPONSE_reply_transfer_pending (struct MHD_Connection *connection,
-                                     struct GNUNET_TIME_Absolute 
planned_exec_time)
-{
-  return TEH_RESPONSE_reply_json_pack (connection,
-                                       MHD_HTTP_ACCEPTED,
-                                       "{s:o}",
-                                       "execution_time", 
GNUNET_JSON_from_time_abs (planned_exec_time));
-}
-
-
 /* end of taler-exchange-httpd_responses.c */
diff --git a/src/exchange/taler-exchange-httpd_responses.h 
b/src/exchange/taler-exchange-httpd_responses.h
index 226aa8a..1e504fd 100644
--- a/src/exchange/taler-exchange-httpd_responses.h
+++ b/src/exchange/taler-exchange-httpd_responses.h
@@ -16,7 +16,7 @@
 
 /**
  * @file taler-exchange-httpd_responses.h
- * @brief API for generating the various replies of the exchange; these
+ * @brief API for generating generic replies of the exchange; these
  *        functions are called TEH_RESPONSE_reply_ and they generate
  *        and queue MHD response objects for a given connection.
  * @author Florian Dold
@@ -288,19 +288,6 @@ TEH_RESPONSE_reply_transaction_unknown (struct 
MHD_Connection *connection,
 
 
 /**
- * A merchant asked for details about a deposit, but
- * we did not execute the deposit yet. Generate a 202 reply.
- *
- * @param connection connection to the client
- * @param planned_exec_time planned execution time
- * @return MHD result code
- */
-int
-TEH_RESPONSE_reply_transfer_pending (struct MHD_Connection *connection,
-                                    struct GNUNET_TIME_Absolute 
planned_exec_time);
-
-
-/**
  * Compile the transaction history of a coin into a JSON object.
  *
  * @param tl transaction history to JSON-ify
diff --git a/src/exchange/taler-exchange-httpd_track_transaction.c 
b/src/exchange/taler-exchange-httpd_track_transaction.c
index 7c4052f..7c1bd6a 100644
--- a/src/exchange/taler-exchange-httpd_track_transaction.c
+++ b/src/exchange/taler-exchange-httpd_track_transaction.c
@@ -31,6 +31,25 @@
 
 
 /**
+ * A merchant asked for details about a deposit, but
+ * we did not execute the deposit yet. Generate a 202 reply.
+ *
+ * @param connection connection to the client
+ * @param planned_exec_time planned execution time
+ * @return MHD result code
+ */
+static int
+reply_transfer_pending (struct MHD_Connection *connection,
+                       struct GNUNET_TIME_Absolute planned_exec_time)
+{
+  return TEH_RESPONSE_reply_json_pack (connection,
+                                       MHD_HTTP_ACCEPTED,
+                                       "{s:o}",
+                                       "execution_time", 
GNUNET_JSON_from_time_abs (planned_exec_time));
+}
+
+
+/**
  * A merchant asked for details about a deposit.  Provide
  * them. Generates the 200 reply.
  *
@@ -272,8 +291,8 @@ check_and_handle_track_transaction_request (struct 
MHD_Connection *connection,
                              &ctx))
     return mhd_ret;
   if (GNUNET_YES == ctx.pending)
-    return TEH_RESPONSE_reply_transfer_pending (connection,
-                                               ctx.execution_time);
+    return reply_transfer_pending (connection,
+                                  ctx.execution_time);
   if (GNUNET_SYSERR == ctx.pending)
     return TEH_RESPONSE_reply_internal_db_error (connection,
                                                 
TALER_EC_TRACK_TRANSACTION_DB_FEE_INCONSISTENT);

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