Merge branch 'rc-0.14.2' of https://github.com/blockstack/blockstack-core into rc-0.14.2

This commit is contained in:
Jude Nelson
2017-04-24 20:12:27 -04:00
2 changed files with 20 additions and 6 deletions

View File

@@ -680,6 +680,9 @@ def get_all_names(offset=None, count=None, proxy=None):
# error
error_str = 'server replied too much data'
return {'error': error_str}
elif len(page) == 0:
# end-of-table
break
all_names += page
@@ -880,6 +883,9 @@ def get_names_in_namespace(namespace_id, offset=None, count=None, proxy=None):
# error
error_str = 'server replied too much data'
return {'error': error_str}
elif len(page) == 0:
# end-of-table
break
all_names += page
@@ -1530,7 +1536,7 @@ def get_nameops_at(block_id, proxy=None):
msg = '{} had {} operations ({} history rows, {} historic nameops, txids: {}) at {}'
log.debug(
msg.format(
nameop.get('name', 'UNKNOWN'), len(history[block_id]), len(history_rows),
nameop.get('name', 'UNKNOWN'), len(history), len(history_rows),
len(historic_nameops), [op['txid'] for op in historic_nameops], block_id
)
)