commit 6fa1d3108811820a111daaf442b094209bacfecb
parent b49aadf745b1b83b07e6a61aa2f105c2837fe5e7
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Fri, 28 Apr 2017 17:19:22 +0200
remove comment
Diffstat:
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
@@ -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
@@ -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