From a9972c48729cb394dd44df6c0c598c6121314926 Mon Sep 17 00:00:00 2001
From: Holger <holger@nahrstaedt.de>
Date: Wed, 30 Jan 2019 18:05:12 +0100
Subject: [PATCH] Nodelist udpated
* normal and appbase option for Nodelist are deprecated.
* exclude_limited added for getting a nodelist without api.steemit.com.
* full node server added
* unit tests adapted
---
beem/nodelist.py | 18 +++++++++++---
tests/beem/test_account.py | 7 +++---
tests/beem/test_amount.py | 4 +--
tests/beem/test_asset.py | 4 +--
tests/beem/test_base_objects.py | 4 +--
tests/beem/test_block.py | 4 +--
tests/beem/test_blockchain.py | 4 +--
tests/beem/test_blockchain_batch.py | 4 +--
tests/beem/test_blockchain_threading.py | 4 +--
tests/beem/test_cli.py | 7 +++---
tests/beem/test_comment.py | 7 +++---
tests/beem/test_connection.py | 11 ++++-----
tests/beem/test_constants.py | 4 +--
tests/beem/test_discussions.py | 7 +++---
tests/beem/test_instance.py | 4 +--
tests/beem/test_market.py | 4 +--
tests/beem/test_message.py | 4 +--
tests/beem/test_nodelist.py | 6 ++---
tests/beem/test_price.py | 4 +--
tests/beem/test_steem.py | 4 +--
tests/beem/test_steemconnect.py | 4 +--
tests/beem/test_storage.py | 4 +--
tests/beem/test_txbuffers.py | 6 ++---
tests/beem/test_vote.py | 4 +--
tests/beem/test_wallet.py | 4 +--
tests/beem/test_witness.py | 33 ++++++++++++-------------
26 files changed, 86 insertions(+), 84 deletions(-)
diff --git a/beem/nodelist.py b/beem/nodelist.py
index 9b18e8da..8c04bcb4 100644
--- a/beem/nodelist.py
+++ b/beem/nodelist.py
@@ -29,7 +29,7 @@ class NodeList(list):
{
"url": "https://api.steemit.com",
"version": "0.20.2",
- "type": "appbase",
+ "type": "appbase-limited",
"owner": "steemit",
"score": 100
},
@@ -236,6 +236,13 @@ class NodeList(list):
"owner": "curie",
"score": -10
},
+ {
+ "url": "https://rpc.usesteem.com",
+ "version": "0.20.8",
+ "type": "appbase",
+ "owner": "themarkymark",
+ "score": 50
+ },
{
"url": "wss://testnet.steem.vc",
"version": "0.19.2",
@@ -361,15 +368,16 @@ class NodeList(list):
new_nodes.append(new_node)
super(NodeList, self).__init__(new_nodes)
- def get_nodes(self, normal=True, appbase=True, dev=False, testnet=False, testnetdev=False, wss=True, https=True, not_working=False):
+ def get_nodes(self, exclude_limited=True, dev=False, testnet=False, testnetdev=False, wss=True, https=True, not_working=False, normal=True, appbase=True):
""" Returns nodes as list
- :param bool normal: when True, nodes with version 0.19.5 are included
- :param bool appbase: when True, nodes with version 0.19.11 are included
+ :param bool exclude_limited: When True, limited nodes are excluded
:param bool dev: when True, dev nodes with version 0.19.11 are included
:param bool testnet: when True, testnet nodes are included
:param bool testnetdev: When True, testnet-dev nodes are included
:param bool not_working: When True, all nodes including not working ones will be returned
+ :param bool normal: deprecated
+ :param bool appbase: deprecated
"""
node_list = []
@@ -384,6 +392,8 @@ class NodeList(list):
node_type_list.append("testnet")
if testnetdev:
node_type_list.append("testnet-dev")
+ if not exclude_limited:
+ node_type_list.append("appbase-limited")
for node in self:
if node["type"] in node_type_list and (node["score"] >= 0 or not_working):
if not https and node["url"][:5] == 'https':
diff --git a/tests/beem/test_account.py b/tests/beem/test_account.py
index 3b97bb74..f0d53ab1 100644
--- a/tests/beem/test_account.py
+++ b/tests/beem/test_account.py
@@ -27,10 +27,9 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
- node_list = nodelist.get_nodes()
- if "https://api.steemit.com" in node_list:
- node_list.remove("https://api.steemit.com")
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ node_list = nodelist.get_nodes(exclude_limited=True)
+
cls.bts = Steem(
node=node_list,
nobroadcast=True,
diff --git a/tests/beem/test_amount.py b/tests/beem/test_amount.py
index 530ce4f6..26fd940c 100644
--- a/tests/beem/test_amount.py
+++ b/tests/beem/test_amount.py
@@ -16,9 +16,9 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
- node=nodelist.get_nodes(appbase=False),
+ node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
num_retries=10
)
diff --git a/tests/beem/test_asset.py b/tests/beem/test_asset.py
index b94ba294..f58b6c9b 100644
--- a/tests/beem/test_asset.py
+++ b/tests/beem/test_asset.py
@@ -17,9 +17,9 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
- node=nodelist.get_nodes(),
+ node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
num_retries=10
)
diff --git a/tests/beem/test_base_objects.py b/tests/beem/test_base_objects.py
index 5da9add5..c2b23af2 100644
--- a/tests/beem/test_base_objects.py
+++ b/tests/beem/test_base_objects.py
@@ -15,9 +15,9 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
- node=nodelist.get_nodes(),
+ node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
num_retries=10
)
diff --git a/tests/beem/test_block.py b/tests/beem/test_block.py
index 739151ce..d5f8c612 100644
--- a/tests/beem/test_block.py
+++ b/tests/beem/test_block.py
@@ -19,9 +19,9 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
- node=nodelist.get_nodes(),
+ node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
keys={"active": wif},
num_retries=10
diff --git a/tests/beem/test_blockchain.py b/tests/beem/test_blockchain.py
index 751e8d0f..ddf0b29d 100644
--- a/tests/beem/test_blockchain.py
+++ b/tests/beem/test_blockchain.py
@@ -25,9 +25,9 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
- node=nodelist.get_nodes(),
+ node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
keys={"active": wif},
num_retries=10
diff --git a/tests/beem/test_blockchain_batch.py b/tests/beem/test_blockchain_batch.py
index 3a1b7be2..311eede3 100644
--- a/tests/beem/test_blockchain_batch.py
+++ b/tests/beem/test_blockchain_batch.py
@@ -23,9 +23,9 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
- node=nodelist.get_nodes(),
+ node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
num_retries=10,
timeout=30,
diff --git a/tests/beem/test_blockchain_threading.py b/tests/beem/test_blockchain_threading.py
index ddff8554..3599dc8a 100644
--- a/tests/beem/test_blockchain_threading.py
+++ b/tests/beem/test_blockchain_threading.py
@@ -20,9 +20,9 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
- node=nodelist.get_nodes(),
+ node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
timeout=30,
num_retries=30,
diff --git a/tests/beem/test_cli.py b/tests/beem/test_cli.py
index f14bcdc4..2a02ca06 100644
--- a/tests/beem/test_cli.py
+++ b/tests/beem/test_cli.py
@@ -29,10 +29,9 @@ class Testcases(unittest.TestCase):
def setUpClass(cls):
nodelist = NodeList()
nodelist.update_nodes()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
- cls.node_list = nodelist.get_nodes()
- if "https://api.steemit.com" in cls.node_list:
- cls.node_list.remove("https://api.steemit.com")
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ cls.node_list = nodelist.get_nodes(exclude_limited=True)
+
# stm = shared_steem_instance()
# stm.config.refreshBackup()
runner = CliRunner()
diff --git a/tests/beem/test_comment.py b/tests/beem/test_comment.py
index 387c6ecb..4fad9f72 100644
--- a/tests/beem/test_comment.py
+++ b/tests/beem/test_comment.py
@@ -21,10 +21,9 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
- node_list = nodelist.get_nodes()
- if "https://api.steemit.com" in node_list:
- node_list.remove("https://api.steemit.com")
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ node_list = nodelist.get_nodes(exclude_limited=True)
+
cls.bts = Steem(
node=node_list,
use_condenser=True,
diff --git a/tests/beem/test_connection.py b/tests/beem/test_connection.py
index ae1b2608..256f434e 100644
--- a/tests/beem/test_connection.py
+++ b/tests/beem/test_connection.py
@@ -13,15 +13,14 @@ class Testcases(unittest.TestCase):
def test_stm1stm2(self):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
b1 = Steem(
node="https://api.steemit.com",
nobroadcast=True,
num_retries=10
)
- node_list = nodelist.get_nodes()
- if "https://api.steemit.com" in node_list:
- node_list.remove("https://api.steemit.com")
+ node_list = nodelist.get_nodes(exclude_limited=True)
+
b2 = Steem(
node=node_list,
nobroadcast=True,
@@ -32,10 +31,10 @@ class Testcases(unittest.TestCase):
def test_default_connection(self):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
b2 = Steem(
- node=nodelist.get_nodes(),
+ node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
)
set_shared_steem_instance(b2)
diff --git a/tests/beem/test_constants.py b/tests/beem/test_constants.py
index 8a5a6524..3b0e0a4e 100644
--- a/tests/beem/test_constants.py
+++ b/tests/beem/test_constants.py
@@ -21,9 +21,9 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.appbase = Steem(
- node=nodelist.get_nodes(appbase=True, dev=True),
+ node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
bundle=False,
# Overwrite wallet to use this list of wifs only
diff --git a/tests/beem/test_discussions.py b/tests/beem/test_discussions.py
index 2fae4f50..fefb9d3e 100644
--- a/tests/beem/test_discussions.py
+++ b/tests/beem/test_discussions.py
@@ -25,10 +25,9 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
- node_list = nodelist.get_nodes()
- if "https://api.steemit.com" in node_list:
- node_list.remove("https://api.steemit.com")
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False, appbase=True), num_retries=10))
+ node_list = nodelist.get_nodes(exclude_limited=True)
+
cls.bts = Steem(
node=node_list,
use_condenser=True,
diff --git a/tests/beem/test_instance.py b/tests/beem/test_instance.py
index 02193f90..ec6a00d1 100644
--- a/tests/beem/test_instance.py
+++ b/tests/beem/test_instance.py
@@ -39,13 +39,13 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
cls.nodelist = NodeList()
- cls.nodelist.update_nodes(steem_instance=Steem(node=cls.nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ cls.nodelist.update_nodes(steem_instance=Steem(node=cls.nodelist.get_nodes(exclude_limited=False), num_retries=10))
stm = Steem(node=cls.nodelist.get_nodes())
stm.config.refreshBackup()
stm.set_default_nodes(["xyz"])
del stm
- cls.urls = cls.nodelist.get_nodes()
+ cls.urls = cls.nodelist.get_nodes(exclude_limited=True)
cls.bts = Steem(
node=cls.urls,
nobroadcast=True,
diff --git a/tests/beem/test_market.py b/tests/beem/test_market.py
index 360ee72e..cf155828 100644
--- a/tests/beem/test_market.py
+++ b/tests/beem/test_market.py
@@ -22,9 +22,9 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
- node=nodelist.get_nodes(),
+ node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
unsigned=True,
keys={"active": wif},
diff --git a/tests/beem/test_message.py b/tests/beem/test_message.py
index 53dae03b..5529ec4b 100644
--- a/tests/beem/test_message.py
+++ b/tests/beem/test_message.py
@@ -16,9 +16,9 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
- node=nodelist.get_nodes(),
+ node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
keys=[wif],
num_retries=10
diff --git a/tests/beem/test_nodelist.py b/tests/beem/test_nodelist.py
index 242aee8f..3d21deaa 100644
--- a/tests/beem/test_nodelist.py
+++ b/tests/beem/test_nodelist.py
@@ -15,7 +15,7 @@ class Testcases(unittest.TestCase):
def setUpClass(cls):
nodelist = NodeList()
cls.bts = Steem(
- node=nodelist.get_nodes(),
+ node=nodelist.get_nodes(exclude_limited=False),
nobroadcast=True,
num_retries=10
)
@@ -23,14 +23,14 @@ class Testcases(unittest.TestCase):
def test_get_nodes(self):
nodelist = NodeList()
- all_nodes = nodelist.get_nodes(normal=True, appbase=True, dev=True, testnet=True, testnetdev=True)
+ all_nodes = nodelist.get_nodes(exclude_limited=False, dev=True, testnet=True, testnetdev=True)
self.assertEqual(len(nodelist) - 13, len(all_nodes))
https_nodes = nodelist.get_nodes(wss=False)
self.assertEqual(https_nodes[0][:5], 'https')
def test_nodes_update(self):
nodelist = NodeList()
- all_nodes = nodelist.get_nodes(normal=True, appbase=True, dev=True, testnet=True)
+ all_nodes = nodelist.get_nodes(exclude_limited=False, dev=True, testnet=True)
nodelist.update_nodes(steem_instance=self.bts)
nodes = nodelist.get_nodes()
self.assertIn(nodes[0], all_nodes)
diff --git a/tests/beem/test_price.py b/tests/beem/test_price.py
index 608cc214..dbd3fafd 100644
--- a/tests/beem/test_price.py
+++ b/tests/beem/test_price.py
@@ -15,9 +15,9 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
steem = Steem(
- node=nodelist.get_nodes(),
+ node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
num_retries=10
)
diff --git a/tests/beem/test_steem.py b/tests/beem/test_steem.py
index 9b3f4d01..d1d6f446 100644
--- a/tests/beem/test_steem.py
+++ b/tests/beem/test_steem.py
@@ -32,9 +32,9 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
cls.nodelist = NodeList()
- cls.nodelist.update_nodes(steem_instance=Steem(node=cls.nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ cls.nodelist.update_nodes(steem_instance=Steem(node=cls.nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
- node=cls.nodelist.get_nodes(),
+ node=cls.nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
unsigned=True,
data_refresh_time_seconds=900,
diff --git a/tests/beem/test_steemconnect.py b/tests/beem/test_steemconnect.py
index 453186e8..d70eb056 100644
--- a/tests/beem/test_steemconnect.py
+++ b/tests/beem/test_steemconnect.py
@@ -32,9 +32,9 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
- node=nodelist.get_nodes(),
+ node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
unsigned=True,
data_refresh_time_seconds=900,
diff --git a/tests/beem/test_storage.py b/tests/beem/test_storage.py
index 030a4945..2c0985b2 100644
--- a/tests/beem/test_storage.py
+++ b/tests/beem/test_storage.py
@@ -33,10 +33,10 @@ class Testcases(unittest.TestCase):
stm = shared_steem_instance()
stm.config.refreshBackup()
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.stm = Steem(
- node=nodelist.get_nodes(),
+ node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
# We want to bundle many operations into a single transaction
bundle=True,
diff --git a/tests/beem/test_txbuffers.py b/tests/beem/test_txbuffers.py
index 501837b3..c977e6de 100644
--- a/tests/beem/test_txbuffers.py
+++ b/tests/beem/test_txbuffers.py
@@ -32,10 +32,8 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
- node_list = nodelist.get_nodes()
- if "https://api.steemit.com" in node_list:
- node_list.remove("https://api.steemit.com")
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ node_list = nodelist.get_nodes(exclude_limited=True)
cls.stm = Steem(
node=node_list,
keys={"active": wif, "owner": wif, "memo": wif},
diff --git a/tests/beem/test_vote.py b/tests/beem/test_vote.py
index 9177621a..454cc15a 100644
--- a/tests/beem/test_vote.py
+++ b/tests/beem/test_vote.py
@@ -23,9 +23,9 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
- node=nodelist.get_nodes(),
+ node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
keys={"active": wif},
num_retries=10
diff --git a/tests/beem/test_wallet.py b/tests/beem/test_wallet.py
index a7635592..e080e440 100644
--- a/tests/beem/test_wallet.py
+++ b/tests/beem/test_wallet.py
@@ -24,10 +24,10 @@ class Testcases(unittest.TestCase):
stm = shared_steem_instance()
stm.config.refreshBackup()
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.stm = Steem(
- node=nodelist.get_nodes(),
+ node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
# We want to bundle many operations into a single transaction
bundle=True,
diff --git a/tests/beem/test_witness.py b/tests/beem/test_witness.py
index fc8433fe..58d71379 100644
--- a/tests/beem/test_witness.py
+++ b/tests/beem/test_witness.py
@@ -18,17 +18,16 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
- node=nodelist.get_nodes(),
+ node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
unsigned=True,
keys={"active": wif},
num_retries=10
)
- cls.testnet = Steem(
- # node="https://testnet.timcliff.com",
- node=nodelist.get_nodes(),
+ cls.steemit = Steem(
+ node="https://api.steemit.com",
nobroadcast=True,
unsigned=True,
keys={"active": wif},
@@ -41,13 +40,13 @@ class Testcases(unittest.TestCase):
@parameterized.expand([
("normal"),
- ("testnet"),
+ ("steemit"),
])
def test_feed_publish(self, node_param):
if node_param == "normal":
bts = self.bts
else:
- bts = self.testnet
+ bts = self.steemit
bts.txbuffer.clear()
w = Witness("gtg", steem_instance=bts)
tx = w.feed_publish("4 SBD", "1 STEEM")
@@ -62,13 +61,13 @@ class Testcases(unittest.TestCase):
@parameterized.expand([
("normal"),
- ("testnet"),
+ ("steemit"),
])
def test_update(self, node_param):
if node_param == "normal":
bts = self.bts
else:
- bts = self.testnet
+ bts = self.steemit
bts.txbuffer.clear()
w = Witness("gtg", steem_instance=bts)
props = {"account_creation_fee": "0.1 STEEM",
@@ -83,13 +82,13 @@ class Testcases(unittest.TestCase):
@parameterized.expand([
("normal"),
- ("testnet"),
+ ("steemit"),
])
def test_witnesses(self, node_param):
if node_param == "normal":
bts = self.bts
else:
- bts = self.testnet
+ bts = self.steemit
w = Witnesses(steem_instance=bts)
w.printAsTable()
self.assertTrue(len(w) > 0)
@@ -97,13 +96,13 @@ class Testcases(unittest.TestCase):
@parameterized.expand([
("normal"),
- ("testnet"),
+ ("steemit"),
])
def test_WitnessesVotedByAccount(self, node_param):
if node_param == "normal":
bts = self.bts
else:
- bts = self.testnet
+ bts = self.steemit
w = WitnessesVotedByAccount("gtg", steem_instance=bts)
w.printAsTable()
self.assertTrue(len(w) > 0)
@@ -111,13 +110,13 @@ class Testcases(unittest.TestCase):
@parameterized.expand([
("normal"),
- ("testnet"),
+ ("steemit"),
])
def test_WitnessesRankedByVote(self, node_param):
if node_param == "normal":
bts = self.bts
else:
- bts = self.testnet
+ bts = self.steemit
w = WitnessesRankedByVote(steem_instance=bts)
w.printAsTable()
self.assertTrue(len(w) > 0)
@@ -125,13 +124,13 @@ class Testcases(unittest.TestCase):
@parameterized.expand([
("normal"),
- ("testnet"),
+ ("steemit"),
])
def test_export(self, node_param):
if node_param == "normal":
bts = self.bts
else:
- bts = self.testnet
+ bts = self.steemit
owner = "gtg"
if bts.rpc.get_use_appbase():
witness = bts.rpc.find_witnesses({'owners': [owner]}, api="database")['witnesses']
--
GitLab