[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] branch master updated: contract->proposal
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant] branch master updated: contract->proposal |
Date: |
Thu, 02 Feb 2017 17:18:45 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new 832838e contract->proposal
832838e is described below
commit 832838e21fde67bb1d94fe85eb433be5d2d09f1c
Author: Marcello Stanisci <address@hidden>
AuthorDate: Mon Jan 30 16:30:03 2017 +0100
contract->proposal
---
src/backend/Makefile.am | 2 +-
src/backend/taler-merchant-httpd.c | 11 ++++-------
src/backend/taler-merchant-httpd_history.c | 2 +-
src/backend/taler-merchant-httpd_history.h | 2 +-
src/backend/taler-merchant-httpd_map.h | 2 +-
...chant-httpd_contract.c => taler-merchant-httpd_propose.c} | 12 ++++++------
...chant-httpd_contract.h => taler-merchant-httpd_propose.h} | 4 ++--
7 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index f7fc4c8..9a5b2d6 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -19,7 +19,7 @@ taler_merchant_httpd_SOURCES = \
taler-merchant-httpd_mhd.c taler-merchant-httpd_mhd.h \
taler-merchant-httpd_auditors.c taler-merchant-httpd_auditors.h \
taler-merchant-httpd_exchanges.c taler-merchant-httpd_exchanges.h \
- taler-merchant-httpd_contract.c taler-merchant-httpd_contract.h \
+ taler-merchant-httpd_propose.c taler-merchant-httpd_propose.h \
taler-merchant-httpd_pay.c taler-merchant-httpd_pay.h \
taler-merchant-httpd_history.c taler-merchant-httpd_history.h \
taler-merchant-httpd_track-transaction.c
taler-merchant-httpd_track-transaction.h \
diff --git a/src/backend/taler-merchant-httpd.c
b/src/backend/taler-merchant-httpd.c
index 95ac4b3..e571ee6 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -35,7 +35,7 @@
#include "taler-merchant-httpd_mhd.h"
#include "taler-merchant-httpd_auditors.h"
#include "taler-merchant-httpd_exchanges.h"
-#include "taler-merchant-httpd_contract.h"
+#include "taler-merchant-httpd_propose.h"
#include "taler-merchant-httpd_pay.h"
#include "taler-merchant-httpd_track-transaction.h"
#include "taler-merchant-httpd_track-transfer.h"
@@ -166,8 +166,8 @@ url_handler (void *cls,
&TMH_MHD_handler_static_response, MHD_HTTP_OK },
{ "/contract", MHD_HTTP_METHOD_POST, "application/json",
NULL, 0,
- &MH_handler_contract, MHD_HTTP_OK },
- { "/contract", NULL, "text/plain",
+ &MH_handler_propose, MHD_HTTP_OK },
+ { "/contract/propose", NULL, "text/plain",
"Only POST is allowed", 0,
&TMH_MHD_handler_send_json_pack_error, MHD_HTTP_METHOD_NOT_ALLOWED },
@@ -192,10 +192,7 @@ url_handler (void *cls,
{ "/history", MHD_HTTP_METHOD_GET, "text/plain",
"Only GET is allowed", 0,
&MH_handler_history, MHD_HTTP_OK},
- { "/map/in", MHD_HTTP_METHOD_POST, NULL,
- "Only POST is allowed", 0,
- &MH_handler_map_in, MHD_HTTP_OK},
- { "/map/out", MHD_HTTP_METHOD_GET, "text/plain",
+ { "/contract/lookup", MHD_HTTP_METHOD_GET, "text/plain",
"Only GET is allowed", 0,
&MH_handler_map_out, MHD_HTTP_OK},
{NULL, NULL, NULL, NULL, 0, 0 }
diff --git a/src/backend/taler-merchant-httpd_history.c
b/src/backend/taler-merchant-httpd_history.c
index d072814..40b7806 100644
--- a/src/backend/taler-merchant-httpd_history.c
+++ b/src/backend/taler-merchant-httpd_history.c
@@ -14,7 +14,7 @@
TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
/**
- * @file backend/taler-merchant-httpd_contract.c
+ * @file backend/taler-merchant-httpd_history.c
* @brief HTTP serving layer mainly intended to communicate with the frontend
* @author Marcello Stanisci
*/
diff --git a/src/backend/taler-merchant-httpd_history.h
b/src/backend/taler-merchant-httpd_history.h
index 3004c4a..a06e926 100644
--- a/src/backend/taler-merchant-httpd_history.h
+++ b/src/backend/taler-merchant-httpd_history.h
@@ -14,7 +14,7 @@
TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
/**
- * @file backend/taler-merchant-httpd_contract.c
+ * @file backend/taler-merchant-httpd_history.c
* @brief HTTP serving layer mainly intended to communicate with the frontend
* @author Marcello Stanisci
*/
diff --git a/src/backend/taler-merchant-httpd_map.h
b/src/backend/taler-merchant-httpd_map.h
index de9150a..83aca2b 100644
--- a/src/backend/taler-merchant-httpd_map.h
+++ b/src/backend/taler-merchant-httpd_map.h
@@ -14,7 +14,7 @@
TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
/**
- * @file backend/taler-merchant-httpd_contract.c
+ * @file backend/taler-merchant-httpd_map.c
* @brief HTTP serving layer mainly intended to communicate with the frontend
* @author Marcello Stanisci
*/
diff --git a/src/backend/taler-merchant-httpd_contract.c
b/src/backend/taler-merchant-httpd_propose.c
similarity index 96%
rename from src/backend/taler-merchant-httpd_contract.c
rename to src/backend/taler-merchant-httpd_propose.c
index 91e95d6..ed222c9 100644
--- a/src/backend/taler-merchant-httpd_contract.c
+++ b/src/backend/taler-merchant-httpd_propose.c
@@ -14,7 +14,7 @@
TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
/**
- * @file backend/taler-merchant-httpd_contract.c
+ * @file backend/taler-merchant-httpd_propose.c
* @brief HTTP serving layer mainly intended to communicate with the frontend
* @author Marcello Stanisci
*/
@@ -136,11 +136,11 @@ get_instance (struct json_t *json);
* @return MHD result code
*/
int
-MH_handler_contract (struct TMH_RequestHandler *rh,
- struct MHD_Connection *connection,
- void **connection_cls,
- const char *upload_data,
- size_t *upload_data_size)
+MH_handler_propose (struct TMH_RequestHandler *rh,
+ struct MHD_Connection *connection,
+ void **connection_cls,
+ const char *upload_data,
+ size_t *upload_data_size)
{
json_t *root;
diff --git a/src/backend/taler-merchant-httpd_contract.h
b/src/backend/taler-merchant-httpd_propose.h
similarity index 93%
rename from src/backend/taler-merchant-httpd_contract.h
rename to src/backend/taler-merchant-httpd_propose.h
index d8077dd..ad3e1dc 100644
--- a/src/backend/taler-merchant-httpd_contract.h
+++ b/src/backend/taler-merchant-httpd_propose.h
@@ -14,7 +14,7 @@
TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
/**
- * @file backend/taler-merchant-httpd_contract.h
+ * @file backend/taler-merchant-httpd_propose.h
* @brief headers for /contract handler
* @author Marcello Stanisci
*/
@@ -34,7 +34,7 @@
* @return MHD result code
*/
int
-MH_handler_contract (struct TMH_RequestHandler *rh,
+MH_handler_propose (struct TMH_RequestHandler *rh,
struct MHD_Connection *connection,
void **connection_cls,
const char *upload_data,
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-merchant] branch master updated: contract->proposal,
gnunet <=