Skip to content
Snippets Groups Projects
Commit 4cf18f50 authored by Holger's avatar Holger
Browse files

Add use_condenser to witnesses and update changelog

parent 7ee4bc5c
No related branches found
No related tags found
2 merge requests!5Taken current version of master branch in the https://github.com/holgern/beem,!4Original changes pushed to master at https://github.com/holgern/beem
...@@ -10,6 +10,7 @@ Changelog ...@@ -10,6 +10,7 @@ Changelog
* Add set_expiration to Object Cache * Add set_expiration to Object Cache
* Use floor instead of round in beembase/Amount in order to handle floats which have a higher precision than allowed * Use floor instead of round in beembase/Amount in order to handle floats which have a higher precision than allowed
* json_str parameter has been added to beembase.Amount, when True, a json dict is returned as string (needing when broadcasting with use_condenser=False) * json_str parameter has been added to beembase.Amount, when True, a json dict is returned as string (needing when broadcasting with use_condenser=False)
* Handle deleted comments in beempy pending thanks to @crokkon
0.24.8 0.24.8
------ ------
......
...@@ -360,7 +360,10 @@ class Witnesses(WitnessesObject): ...@@ -360,7 +360,10 @@ class Witnesses(WitnessesObject):
if self.blockchain.rpc.get_use_appbase(): if self.blockchain.rpc.get_use_appbase():
self.active_witnessess = self.blockchain.rpc.get_active_witnesses(api="database")['witnesses'] self.active_witnessess = self.blockchain.rpc.get_active_witnesses(api="database")['witnesses']
self.schedule = self.blockchain.rpc.get_witness_schedule(api="database") self.schedule = self.blockchain.rpc.get_witness_schedule(api="database")
self.witness_count = self.blockchain.rpc.get_witness_count(api="condenser") if self.blockchain.config["use_condenser"]:
self.witness_count = self.blockchain.rpc.get_witness_count(api="condenser")
else:
self.witness_count = self.blockchain.rpc.get_witness_count()
else: else:
self.active_witnessess = self.blockchain.rpc.get_active_witnesses() self.active_witnessess = self.blockchain.rpc.get_active_witnesses()
self.schedule = self.blockchain.rpc.get_witness_schedule() self.schedule = self.blockchain.rpc.get_witness_schedule()
...@@ -446,7 +449,7 @@ class WitnessesRankedByVote(WitnessesObject): ...@@ -446,7 +449,7 @@ class WitnessesRankedByVote(WitnessesObject):
witnessList = [] witnessList = []
last_limit = limit last_limit = limit
self.identifier = "" self.identifier = ""
use_condenser = True use_condenser = self.blockchain.config["use_condenser"]
self.blockchain.rpc.set_next_node_on_empty_reply(False) self.blockchain.rpc.set_next_node_on_empty_reply(False)
if self.blockchain.rpc.get_use_appbase() and not use_condenser: if self.blockchain.rpc.get_use_appbase() and not use_condenser:
query_limit = 1000 query_limit = 1000
...@@ -474,7 +477,7 @@ class WitnessesRankedByVote(WitnessesObject): ...@@ -474,7 +477,7 @@ class WitnessesRankedByVote(WitnessesObject):
if (last_limit < limit): if (last_limit < limit):
last_limit += 1 last_limit += 1
if self.blockchain.rpc.get_use_appbase() and not use_condenser: if self.blockchain.rpc.get_use_appbase() and not use_condenser:
witnessess = self.blockchain.rpc.list_witnesses({'start': [last_account], 'limit': last_limit, 'order': 'by_vote_name'}, api="database")['witnesses'] witnessess = self.blockchain.rpc.list_witnesses({'start': [0, last_account], 'limit': last_limit, 'order': 'by_vote_name'}, api="database")['witnesses']
elif self.blockchain.rpc.get_use_appbase() and use_condenser: elif self.blockchain.rpc.get_use_appbase() and use_condenser:
witnessess = self.blockchain.rpc.get_witnesses_by_vote(last_account, last_limit, api="condenser") witnessess = self.blockchain.rpc.get_witnesses_by_vote(last_account, last_limit, api="condenser")
else: else:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment