[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] branch master updated: remove comment
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant] branch master updated: remove comment |
Date: |
Fri, 28 Apr 2017 17:19:37 +0200 |
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 6fa1d31 remove comment
6fa1d31 is described below
commit 6fa1d3108811820a111daaf442b094209bacfecb
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri Apr 28 17:19:22 2017 +0200
remove comment
---
src/backend/taler-merchant-httpd_exchanges.c | 1 -
src/mitm/talermerchantmitm/mitm.py | 6 +-----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_exchanges.c
b/src/backend/taler-merchant-httpd_exchanges.c
index daf5550..3859390 100644
--- a/src/backend/taler-merchant-httpd_exchanges.c
+++ b/src/backend/taler-merchant-httpd_exchanges.c
@@ -586,7 +586,6 @@ keys_mgmt_cb (void *cls,
struct Exchange *exchange = cls;
struct GNUNET_TIME_Absolute expire;
struct GNUNET_TIME_Relative delay;
-
if (NULL == keys)
{
exchange->pending = GNUNET_YES;
diff --git a/src/mitm/talermerchantmitm/mitm.py
b/src/mitm/talermerchantmitm/mitm.py
index 2c7aaaf..9c92aba 100644
--- a/src/mitm/talermerchantmitm/mitm.py
+++ b/src/mitm/talermerchantmitm/mitm.py
@@ -31,11 +31,6 @@ import json
from random import randint
from datetime import datetime
-# FIXME
-
-# 1) make this as a standalone executable, like taler-merchant-mitm.
-# 2) accept the exchange url as a cli option.
-
app = Flask(__name__)
app.secret_key = base64.b64encode(os.urandom(64)).decode('utf-8')
logger = logging.getLogger(__name__)
@@ -73,4 +68,5 @@ def all(path):
}
func = dispatcher.get(request.headers.get("X-Taler-Mitm"),
lambda x: x)
+
return jsonify(func(resp)), r.status_code
--
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: remove comment,
gnunet <=