Unpin flask-cors, revert extra changes

This commit is contained in:
vrde 2017-05-12 14:31:58 +02:00
parent 444e6fae85
commit f08edd5a52
No known key found for this signature in database
GPG Key ID: 6581C7C39B3D397D
3 changed files with 10 additions and 4 deletions

View File

@ -114,11 +114,16 @@ def condition_details_has_owner(condition_details, owner):
def output_has_owner(output, owner): def output_has_owner(output, owner):
if len(output['public_keys']) > 0: # TODO
# Check whether it is really necessary to treat the single key case
# differently from the multiple keys case, and why not just use the same
# function for both cases.
if len(output['public_keys']) > 1:
return condition_details_has_owner( return condition_details_has_owner(
output['condition']['details'], owner) output['condition']['details'], owner)
return False elif len(output['public_keys']) == 1:
# # TODO raise proper exception, e.g. invalid tx payload? return output['condition']['details']['public_key'] == owner
# TODO raise proper exception, e.g. invalid tx payload?
def is_genesis_block(block): def is_genesis_block(block):

View File

@ -2,6 +2,7 @@
The application is implemented in Flask and runs using Gunicorn. The application is implemented in Flask and runs using Gunicorn.
""" """
import copy import copy
import multiprocessing import multiprocessing

View File

@ -71,7 +71,7 @@ install_requires = [
'python-rapidjson==0.0.11', 'python-rapidjson==0.0.11',
'logstats>=0.2.1', 'logstats>=0.2.1',
'flask>=0.10.1', 'flask>=0.10.1',
'flask-cors==2.1.2', 'flask-cors~=2.1.2',
'flask-restful~=0.3.0', 'flask-restful~=0.3.0',
'requests~=2.9', 'requests~=2.9',
'gunicorn~=19.0', 'gunicorn~=19.0',