From 0a27fc3422f226ea7e416db068f357254cd07ada Mon Sep 17 00:00:00 2001 From: Vivek Teega Date: Mon, 10 Jun 2019 14:14:24 +0530 Subject: [PATCH] Change in gettransactions API --- ranchimallflo_api.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ranchimallflo_api.py b/ranchimallflo_api.py index df3b86e..8bcc859 100644 --- a/ranchimallflo_api.py +++ b/ranchimallflo_api.py @@ -94,13 +94,13 @@ async def gettransactions(): c.execute( 'SELECT blockNumber, sourceFloAddress, destFloAddress, transferAmount, blockchainReference FROM transactionHistory WHERE sourceFloAddress="{}" ORDER BY id DESC LIMIT 100'.format( senderFloAddress)) - if not senderFloAddress and destFloAddress: + elif not senderFloAddress and destFloAddress: c.execute( 'SELECT blockNumber, sourceFloAddress, destFloAddress, transferAmount, blockchainReference FROM transactionHistory WHERE destFloAddress="{}" ORDER BY id DESC LIMIT 100'.format( destFloAddress)) - if senderFloAddress and destFloAddress: + elif senderFloAddress and destFloAddress: c.execute( - 'SELECT blockNumber, sourceFloAddress, destFloAddress, transferAmount, blockchainReference FROM transactionHistory WHERE sourceFloAddress="{}" OR destFloAddress="{}" ORDER BY id DESC LIMIT 100'.format( + 'SELECT blockNumber, sourceFloAddress, destFloAddress, transferAmount, blockchainReference FROM transactionHistory WHERE sourceFloAddress="{}" AND destFloAddress="{}" ORDER BY id DESC LIMIT 100'.format( senderFloAddress, destFloAddress)) else: @@ -443,7 +443,7 @@ async def broadcast(): if verify_signature(signature, sse_pubKey, data['message'].encode()): for queue in app.clients: await queue.put(data['message']) - return jsonify(True) + return jsonify(True) else: return jsonify(False)