From b407a5f03af0c75779e66a751224055088658fdd Mon Sep 17 00:00:00 2001
From: Holger <holger@nahrstaedt.de>
Date: Sat, 22 Sep 2018 14:19:50 +0200
Subject: [PATCH] Fix constants and unittests
---
README.rst | 5 ++++-
beem/constants.py | 1 +
tests/beem/test_constants.py | 11 ++++++++++-
tests/beemapi/test_steemnoderpc.py | 4 ++--
4 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/README.rst b/README.rst
index da582a68..640d397b 100644
--- a/README.rst
+++ b/README.rst
@@ -107,7 +107,7 @@ Signing and Verify can be fasten (200 %) by installing cryptography:
pip install -U cryptography
-Install beem by pip::
+Install or update beem by pip::
pip install -U beem
@@ -140,6 +140,9 @@ Signing and Verify can be fasten (200 %) by installing cryptography::
conda install cryptography
+beem can be updated by::
+
+ conda update beem
CLI tool beempy
---------------
diff --git a/beem/constants.py b/beem/constants.py
index 05483a4a..9b66e778 100644
--- a/beem/constants.py
+++ b/beem/constants.py
@@ -10,4 +10,5 @@ STEEM_1_PERCENT = 100
STEEM_REVERSE_AUCTION_WINDOW_SECONDS_HF20 = 900
STEEM_REVERSE_AUCTION_WINDOW_SECONDS_HF6 = 1800
STEEM_VOTE_REGENERATION_SECONDS = 432000
+STEEM_VOTING_MANA_REGENERATION_SECONDS = 432000
STEEM_ROOT_POST_PARENT = ''
diff --git a/tests/beem/test_constants.py b/tests/beem/test_constants.py
index 9d29b2f5..41e5c291 100644
--- a/tests/beem/test_constants.py
+++ b/tests/beem/test_constants.py
@@ -63,15 +63,24 @@ class Testcases(unittest.TestCase):
if "STEEM_REVERSE_AUCTION_WINDOW_SECONDS" in steem_conf:
STEEM_REVERSE_AUCTION_WINDOW_SECONDS = steem_conf['STEEM_REVERSE_AUCTION_WINDOW_SECONDS']
+ elif "STEEM_REVERSE_AUCTION_WINDOW_SECONDS_HF6" in steem_conf:
+ STEEM_REVERSE_AUCTION_WINDOW_SECONDS = steem_conf['STEEM_REVERSE_AUCTION_WINDOW_SECONDS_HF6']
else:
STEEM_REVERSE_AUCTION_WINDOW_SECONDS = steem_conf['STEEMIT_REVERSE_AUCTION_WINDOW_SECONDS']
self.assertEqual(constants.STEEM_REVERSE_AUCTION_WINDOW_SECONDS_HF6, STEEM_REVERSE_AUCTION_WINDOW_SECONDS)
+ if "STEEM_REVERSE_AUCTION_WINDOW_SECONDS_HF20" in steem_conf:
+ self.assertEqual(constants.STEEM_REVERSE_AUCTION_WINDOW_SECONDS_HF20, steem_conf["STEEM_REVERSE_AUCTION_WINDOW_SECONDS_HF20"])
+
if "STEEM_VOTE_REGENERATION_SECONDS" in steem_conf:
STEEM_VOTE_REGENERATION_SECONDS = steem_conf['STEEM_VOTE_REGENERATION_SECONDS']
+ self.assertEqual(constants.STEEM_VOTE_REGENERATION_SECONDS, STEEM_VOTE_REGENERATION_SECONDS)
+ elif "STEEM_VOTING_MANA_REGENERATION_SECONDS" in steem_conf:
+ STEEM_VOTING_MANA_REGENERATION_SECONDS = steem_conf["STEEM_VOTING_MANA_REGENERATION_SECONDS"]
+ self.assertEqual(constants.STEEM_VOTING_MANA_REGENERATION_SECONDS, STEEM_VOTING_MANA_REGENERATION_SECONDS)
else:
STEEM_VOTE_REGENERATION_SECONDS = steem_conf['STEEMIT_VOTE_REGENERATION_SECONDS']
- self.assertEqual(constants.STEEM_VOTE_REGENERATION_SECONDS, STEEM_VOTE_REGENERATION_SECONDS)
+ self.assertEqual(constants.STEEM_VOTE_REGENERATION_SECONDS, STEEM_VOTE_REGENERATION_SECONDS)
if "STEEM_ROOT_POST_PARENT" in steem_conf:
STEEM_ROOT_POST_PARENT = steem_conf['STEEM_ROOT_POST_PARENT']
diff --git a/tests/beemapi/test_steemnoderpc.py b/tests/beemapi/test_steemnoderpc.py
index 662a5a5e..df239a62 100644
--- a/tests/beemapi/test_steemnoderpc.py
+++ b/tests/beemapi/test_steemnoderpc.py
@@ -32,8 +32,8 @@ class Testcases(unittest.TestCase):
def setUpClass(cls):
nodelist = NodeList()
nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=3))
- cls.nodes = nodelist.get_nodes(https=False, appbase=False)
- cls.nodes_https = nodelist.get_nodes(wss=False, appbase=False)
+ cls.nodes = nodelist.get_nodes(https=False, appbase=True)
+ cls.nodes_https = nodelist.get_nodes(wss=False, appbase=True)
cls.nodes_appbase = nodelist.get_nodes(normal=False)
cls.test_list = nodelist.get_nodes()
--
GitLab