diff --git a/hive/server/database_api/methods.py b/hive/server/database_api/methods.py index 28f52188119341228a2f225018b0aefeff6fe71d..9b117f0ce3c3f6720e1ea116dee59fd1d31f7855 100644 --- a/hive/server/database_api/methods.py +++ b/hive/server/database_api/methods.py @@ -172,13 +172,13 @@ def result_presentation(rows, votes_presentation): for row in rows: if votes_presentation == VotesPresentation.DatabaseApi: ret.append(dict(voter=row.voter, author=row.author, permlink=row.permlink, - weight=row.weight, rshares=row.rshares, vote_percent=row.percent, + weight=number_to_json_value(row.weight), rshares=number_to_json_value(row.rshares), vote_percent=row.percent, last_update=str(row.time), num_changes=row.num_changes)) elif votes_presentation == VotesPresentation.CondenserApi: ret.append(dict(percent=str(row.percent), reputation=rep_to_raw(row.reputation), - rshares=str(row.rshares), voter=row.voter)) + rshares=number_to_json_value(row.rshares), voter=row.voter)) elif votes_presentation == VotesPresentation.BridgeApi: - ret.append(dict(rshares=str(row.rshares), voter=row.voter)) + ret.append(dict(rshares=number_to_json_value(row.rshares), voter=row.voter)) else: ret.append(dict(percent=row.percent, reputation=rep_to_raw(row.reputation), rshares=number_to_json_value(row.rshares), time=time_string_with_t(row.time), diff --git a/hive/utils/normalize.py b/hive/utils/normalize.py index 0fe4f5d13c1dffd6bf388474fa1466a234a59b5a..b36af67b7f60da188739683b91257244ef30b49c 100644 --- a/hive/utils/normalize.py +++ b/hive/utils/normalize.py @@ -285,7 +285,7 @@ def number_to_json_value(number): """ if number > 0xFFFFFFFF: return str(number) - return number + return int(number) def time_string_with_t(time_iso8601): """ Ensures that time in format ISO8601 use 'T' as a data time separator