From 4cf18f5006ba6a425eec490dbb26a75b71ed67d9 Mon Sep 17 00:00:00 2001
From: Holger Nahrstaedt <holgernahrstaedt@gmx.de>
Date: Mon, 7 Sep 2020 13:54:30 +0200
Subject: [PATCH] Add use_condenser to witnesses and update changelog
---
CHANGELOG.rst | 1 +
beem/witness.py | 9 ++++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index bd1f06d7..8cc0932c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -10,6 +10,7 @@ Changelog
* 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
* 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
------
diff --git a/beem/witness.py b/beem/witness.py
index 5c25f883..6474b8fa 100644
--- a/beem/witness.py
+++ b/beem/witness.py
@@ -360,7 +360,10 @@ class Witnesses(WitnessesObject):
if self.blockchain.rpc.get_use_appbase():
self.active_witnessess = self.blockchain.rpc.get_active_witnesses(api="database")['witnesses']
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:
self.active_witnessess = self.blockchain.rpc.get_active_witnesses()
self.schedule = self.blockchain.rpc.get_witness_schedule()
@@ -446,7 +449,7 @@ class WitnessesRankedByVote(WitnessesObject):
witnessList = []
last_limit = limit
self.identifier = ""
- use_condenser = True
+ use_condenser = self.blockchain.config["use_condenser"]
self.blockchain.rpc.set_next_node_on_empty_reply(False)
if self.blockchain.rpc.get_use_appbase() and not use_condenser:
query_limit = 1000
@@ -474,7 +477,7 @@ class WitnessesRankedByVote(WitnessesObject):
if (last_limit < limit):
last_limit += 1
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:
witnessess = self.blockchain.rpc.get_witnesses_by_vote(last_account, last_limit, api="condenser")
else:
--
GitLab