diff --git a/beem/cli.py b/beem/cli.py
index 8e428fb353d947fb22a5bed3ceafe6622cb92583..55c2ae056bf054628c0125c1b63578419745f1e4 100644
--- a/beem/cli.py
+++ b/beem/cli.py
@@ -2590,7 +2590,7 @@ def curation(authorperm, account, limit, min_vote, max_vote, min_performance, ma
elif payout is not None:
payout = None
curation_rewards_HBD = comment.get_curation_rewards(pending_payout_HBD=True, pending_payout_value=payout)
- curation_rewards_SP = comment.get_curation_rewards(pending_payout_HBD=False, pending_payout_value=payout)
+ curation_rewards_HP = comment.get_curation_rewards(pending_payout_HBD=False, pending_payout_value=payout)
rows = []
sum_curation = [0, 0, 0, 0]
max_curation = [0, 0, 0, 0, 0, 0]
@@ -2598,7 +2598,7 @@ def curation(authorperm, account, limit, min_vote, max_vote, min_performance, ma
for vote in comment["active_votes"]:
vote_HBD = stm.rshares_to_hbd(int(vote["rshares"]))
curation_HBD = curation_rewards_HBD["active_votes"][vote["voter"]]
- curation_SP = curation_rewards_SP["active_votes"][vote["voter"]]
+ curation_HP = curation_rewards_HP["active_votes"][vote["voter"]]
if vote_HBD > 0:
penalty = ((comment.get_curation_penalty(vote_time=vote["time"])) * vote_HBD)
performance = (float(curation_HBD) / vote_HBD * 100)
@@ -2608,13 +2608,13 @@ def curation(authorperm, account, limit, min_vote, max_vote, min_performance, ma
vote_befor_min = (((vote["time"]) - comment["created"]).total_seconds() / 60)
sum_curation[0] += vote_HBD
sum_curation[1] += penalty
- sum_curation[2] += float(curation_SP)
+ sum_curation[2] += float(curation_HP)
sum_curation[3] += float(curation_HBD)
row = [vote["voter"],
vote_befor_min,
vote_HBD,
penalty,
- float(curation_SP),
+ float(curation_HP),
performance]
if row[-1] > max_curation[-1]:
max_curation = row
@@ -2782,11 +2782,11 @@ def rewards(accounts, only_sum, post, comment, curation, length, author, permlin
payout_HIVE = Amount(v["hive_payout"], hive_instance=stm)
sum_reward[0] += float(payout_HBD)
sum_reward[1] += float(payout_HIVE)
- payout_SP = stm.vests_to_sp(Amount(v["vesting_payout"], hive_instance=stm))
- sum_reward[2] += float(payout_SP)
+ payout_HP = stm.vests_to_sp(Amount(v["vesting_payout"], hive_instance=stm))
+ sum_reward[2] += float(payout_HP)
liquid_USD = float(payout_HBD) / float(latest) * float(median_price) + float(payout_HIVE) * float(median_price)
sum_reward[3] += liquid_USD
- invested_USD = float(payout_SP) * float(median_price)
+ invested_USD = float(payout_HP) * float(median_price)
sum_reward[4] += invested_USD
if c.is_comment():
permlink_row = c.parent_permlink
@@ -2800,15 +2800,15 @@ def rewards(accounts, only_sum, post, comment, curation, length, author, permlin
((now - formatTimeString(v["timestamp"])).total_seconds() / 60 / 60 / 24),
(payout_HBD),
(payout_HIVE),
- (payout_SP),
+ (payout_HP),
(liquid_USD),
(invested_USD)])
elif v["type"] == "curation_reward":
reward = Amount(v["reward"], hive_instance=stm)
- payout_SP = stm.vests_to_sp(reward)
+ payout_HP = stm.vests_to_sp(reward)
liquid_USD = 0
- invested_USD = float(payout_SP) * float(median_price)
- sum_reward[2] += float(payout_SP)
+ invested_USD = float(payout_HP) * float(median_price)
+ sum_reward[2] += float(payout_HP)
sum_reward[4] += invested_USD
if title:
c = Comment(construct_authorperm(v["comment_author"], v["comment_permlink"]), hive_instance=stm)
@@ -2820,7 +2820,7 @@ def rewards(accounts, only_sum, post, comment, curation, length, author, permlin
((now - formatTimeString(v["timestamp"])).total_seconds() / 60 / 60 / 24),
0.000,
0.000,
- payout_SP,
+ payout_HP,
(liquid_USD),
(invested_USD)])
sortedList = sorted(rows, key=lambda row: (row[2]), reverse=False)
@@ -2981,11 +2981,11 @@ def pending(accounts, only_sum, post, comment, curation, length, author, permlin
continue
payout_HBD = author_reward["payout_HBD"]
sum_reward[0] += float(payout_HBD)
- payout_SP = author_reward["payout_SP"]
- sum_reward[1] += float(payout_SP)
+ payout_HP = author_reward["payout_HP"]
+ sum_reward[1] += float(payout_HP)
liquid_USD = float(author_reward["payout_HBD"]) / float(latest) * float(median_price)
sum_reward[2] += liquid_USD
- invested_USD = float(author_reward["payout_SP"]) * float(median_price)
+ invested_USD = float(author_reward["payout_HP"]) * float(median_price)
sum_reward[3] += invested_USD
if v.is_comment():
permlink_row = v.permlink
@@ -2998,7 +2998,7 @@ def pending(accounts, only_sum, post, comment, curation, length, author, permlin
permlink_row,
((v["created"] - limit_time).total_seconds() / 60 / 60 / 24),
(payout_HBD),
- (payout_SP),
+ (payout_HP),
(liquid_USD),
(invested_USD)])
if curation:
@@ -3011,10 +3011,10 @@ def pending(accounts, only_sum, post, comment, curation, length, author, permlin
days_to_payout = ((c["created"] - limit_time).total_seconds() / 60 / 60 / 24)
if days_to_payout < 0:
continue
- payout_SP = rewards["active_votes"][account["name"]]
+ payout_HP = rewards["active_votes"][account["name"]]
liquid_USD = 0
- invested_USD = float(payout_SP) * float(median_price)
- sum_reward[1] += float(payout_SP)
+ invested_USD = float(payout_HP) * float(median_price)
+ sum_reward[1] += float(payout_HP)
sum_reward[3] += invested_USD
if title:
permlink_row = c.title
@@ -3024,7 +3024,7 @@ def pending(accounts, only_sum, post, comment, curation, length, author, permlin
permlink_row,
days_to_payout,
0.000,
- payout_SP,
+ payout_HP,
(liquid_USD),
(invested_USD)])
sortedList = sorted(rows, key=lambda row: (row[2]), reverse=True)
diff --git a/beem/comment.py b/beem/comment.py
index 3dfbbd47a76a0446a5f9dd0b332e81f7afb24b52..32d5e27dc2ae55f91b0a199b8ff361fdf093b169 100644
--- a/beem/comment.py
+++ b/beem/comment.py
@@ -454,7 +454,7 @@ class Comment(BlockchainObject):
{
'pending_rewards': True,
- 'payout_SP': 0.912 HIVE,
+ 'payout_HP': 0.912 HIVE,
'payout_HBD': 3.583 HBD,
'total_payout_HBD': 7.166 HBD
}
@@ -462,7 +462,7 @@ class Comment(BlockchainObject):
"""
if not self.is_pending():
return {'pending_rewards': False,
- "payout_SP": Amount(0, self.hive.hive_symbol, hive_instance=self.hive),
+ "payout_HP": Amount(0, self.hive.hive_symbol, hive_instance=self.hive),
"payout_HBD": Amount(0, self.hive.hbd_symbol, hive_instance=self.hive),
"total_payout_HBD": Amount(self["total_payout_value"], hive_instance=self.hive)}
@@ -482,7 +482,7 @@ class Comment(BlockchainObject):
if median_hist is not None:
hbd_hive = author_tokens * self["percent_hive_dollars"] / 20000.
vesting_hive = median_price.as_base(self.hive.hive_symbol) * (author_tokens - hbd_hive)
- return {'pending_rewards': True, "payout_SP": vesting_hive, "payout_HBD": hbd_hive, "total_payout_HBD": author_tokens}
+ return {'pending_rewards': True, "payout_HP": vesting_hive, "payout_HBD": hbd_hive, "total_payout_HBD": author_tokens}
else:
return {'pending_rewards': True, "total_payout": author_tokens}
diff --git a/beem/snapshot.py b/beem/snapshot.py
index 7b75349a513673c5952931dbad7e3f3b3eeed8e3..6bead4125b0f6783810c8de16e583b4f4802e929 100644
--- a/beem/snapshot.py
+++ b/beem/snapshot.py
@@ -51,8 +51,8 @@ class AccountSnapshot(list):
self.reward_timestamps = []
self.author_rewards = []
self.curation_rewards = []
- self.curation_per_1000_SP_timestamp = []
- self.curation_per_1000_SP = []
+ self.curation_per_1000_HP_timestamp = []
+ self.curation_per_1000_HP = []
self.out_vote_timestamp = []
self.out_vote_weight = []
self.in_vote_timestamp = []
@@ -501,8 +501,8 @@ class AccountSnapshot(list):
def build_curation_arrays(self, end_date=None, sum_days=7):
""" Build curation arrays"""
- self.curation_per_1000_SP_timestamp = []
- self.curation_per_1000_SP = []
+ self.curation_per_1000_HP_timestamp = []
+ self.curation_per_1000_HP = []
if sum_days <= 0:
raise ValueError("sum_days must be greater than 0")
index = 0
@@ -523,8 +523,8 @@ class AccountSnapshot(list):
if ts < end_date:
curation_sum += curation_1k_hp
else:
- self.curation_per_1000_SP_timestamp.append(end_date)
- self.curation_per_1000_SP.append(curation_sum)
+ self.curation_per_1000_HP_timestamp.append(end_date)
+ self.curation_per_1000_HP.append(curation_sum)
end_date = end_date + timedelta(days=sum_days)
curation_sum = 0
diff --git a/docs/tutorials.rst b/docs/tutorials.rst
index 627be57a0647336834603ae26c323ae1f1bdd82b..d880302b312f5a37ec1cfa50a41b42e71397e609 100644
--- a/docs/tutorials.rst
+++ b/docs/tutorials.rst
@@ -241,8 +241,8 @@ Lets calculate the curation reward from the last 7 days:
reward_vests = Amount("0 VESTS")
for reward in acc.history_reverse(stop=stop, only_ops=["curation_reward"]):
reward_vests += Amount(reward['reward'])
- curation_rewards_SP = acc.hive.vests_to_sp(reward_vests.amount)
- print("Rewards are %.3f HP" % curation_rewards_SP)
+ curation_rewards_HP = acc.hive.vests_to_hp(reward_vests.amount)
+ print("Rewards are %.3f HP" % curation_rewards_HP)
Lets display all Posts from an account:
diff --git a/examples/account_curation_per_week_and_1k_sp.py b/examples/account_curation_per_week_and_1k_sp.py
index 04e6ec645a73d431fd2fd08385f7e20c2a871c2b..3d88671b2ce9fb42e91221d216bc65a1790a6a7c 100644
--- a/examples/account_curation_per_week_and_1k_sp.py
+++ b/examples/account_curation_per_week_and_1k_sp.py
@@ -23,12 +23,12 @@ if __name__ == "__main__":
acc_snapshot.get_account_history()
acc_snapshot.build(enable_rewards=True)
acc_snapshot.build_curation_arrays()
- timestamps = acc_snapshot.curation_per_1000_SP_timestamp
- curation_per_1000_SP = acc_snapshot.curation_per_1000_SP
+ timestamps = acc_snapshot.curation_per_1000_HP_timestamp
+ curation_per_1000_HP = acc_snapshot.curation_per_1000_HP
plt.figure(figsize=(12, 6))
opts = {'linestyle': '-', 'marker': '.'}
- plt.plot_date(timestamps, curation_per_1000_SP, label="Curation reward per week and 1k HP", **opts)
+ plt.plot_date(timestamps, curation_per_1000_HP, label="Curation reward per week and 1k HP", **opts)
plt.grid()
plt.legend()
plt.title("Curation over time - @%s" % (account))
@@ -36,4 +36,4 @@ if __name__ == "__main__":
plt.ylabel("Curation rewards (HP / (week * 1k HP))")
plt.show()
# plt.savefig("curation_per_week-%s.png" % (account))
- print("last curation reward per week and 1k hp %.2f HP" % (curation_per_1000_SP[-1]))
+ print("last curation reward per week and 1k hp %.2f HP" % (curation_per_1000_HP[-1]))
diff --git a/tests/beem/test_account.py b/tests/beem/test_account.py
index 5ed7197178e164ae648574d96135a61b0d65f46e..de18e906179909e96eef36248d8fc41d983eb954 100644
--- a/tests/beem/test_account.py
+++ b/tests/beem/test_account.py
@@ -17,7 +17,7 @@ from beem.amount import Amount
from beem.asset import Asset
from beem.utils import formatTimeString
from beem.nodelist import NodeList
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
wif = "5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"
@@ -27,7 +27,7 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
node_list = nodelist.get_nodes(exclude_limited=True)
cls.bts = Steem(
@@ -39,22 +39,22 @@ class Testcases(unittest.TestCase):
keys={"active": wif},
num_retries=10
)
- cls.account = Account("beembot", steem_instance=cls.bts)
- set_shared_steem_instance(cls.bts)
+ cls.account = Account("beembot", hive_instance=cls.bts)
+ set_shared_hive_instance(cls.bts)
def test_account(self):
stm = self.bts
account = self.account
- Account("beembot", steem_instance=stm)
+ Account("beembot", hive_instance=stm)
with self.assertRaises(
exceptions.AccountDoesNotExistsException
):
- Account("DoesNotExistsXXX", steem_instance=stm)
+ Account("DoesNotExistsXXX", hive_instance=stm)
# asset = Asset("1.3.0")
# symbol = asset["symbol"]
self.assertEqual(account.name, "beembot")
self.assertEqual(account["name"], account.name)
- self.assertIsInstance(account.get_balance("available", "SBD"), Amount)
+ self.assertIsInstance(account.get_balance("available", "HBD"), Amount)
account.print_info()
# self.assertIsInstance(account.balance({"symbol": symbol}), Amount)
self.assertIsInstance(account.available_balances, list)
@@ -174,7 +174,7 @@ class Testcases(unittest.TestCase):
def test_history2(self):
stm = self.bts
- account = Account("beembot", steem_instance=stm)
+ account = Account("beembot", hive_instance=stm)
h_list = []
max_index = account.virtual_op_count()
for h in account.history(start=max_index - 4, stop=max_index, use_block_num=False, batch_size=2, raw_output=False):
@@ -206,7 +206,7 @@ class Testcases(unittest.TestCase):
def test_history_reverse2(self):
stm = self.bts
- account = Account("beembot", steem_instance=stm)
+ account = Account("beembot", hive_instance=stm)
h_list = []
max_index = account.virtual_op_count()
for h in account.history_reverse(start=max_index, stop=max_index - 4, use_block_num=False, batch_size=2, raw_output=False):
@@ -239,7 +239,7 @@ class Testcases(unittest.TestCase):
def test_history_block_num(self):
stm = self.bts
zero_element = 0
- account = Account("fullnodeupdate", steem_instance=stm)
+ account = Account("fullnodeupdate", hive_instance=stm)
h_all_raw = []
for h in account.history_reverse(raw_output=True):
h_all_raw.append(h)
@@ -279,9 +279,9 @@ class Testcases(unittest.TestCase):
vp = account.get_voting_power()
self.assertTrue(vp >= 0)
self.assertTrue(vp <= 100)
- sp = account.get_steem_power()
- self.assertTrue(sp >= 0)
- vv = account.get_voting_value_SBD()
+ sp = account.get_hive_power()
+ self.assertTrue(hp >= 0)
+ vv = account.get_voting_value_HBD()
self.assertTrue(vv >= 0)
bw = account.get_bandwidth()
# self.assertTrue(bw['used'] <= bw['allocated'])
@@ -295,8 +295,8 @@ class Testcases(unittest.TestCase):
def test_MissingKeyError(self):
w = self.account
- w.steem.txbuffer.clear()
- tx = w.convert("1 SBD")
+ w.hive.txbuffer.clear()
+ tx = w.convert("1 HBD")
with self.assertRaises(
exceptions.MissingKeyError
):
@@ -304,7 +304,7 @@ class Testcases(unittest.TestCase):
def test_withdraw_vesting(self):
w = self.account
- w.steem.txbuffer.clear()
+ w.hive.txbuffer.clear()
tx = w.withdraw_vesting("100 VESTS")
self.assertEqual(
(tx["operations"][0][0]),
@@ -317,7 +317,7 @@ class Testcases(unittest.TestCase):
def test_delegate_vesting_shares(self):
w = self.account
- w.steem.txbuffer.clear()
+ w.hive.txbuffer.clear()
tx = w.delegate_vesting_shares("test1", "100 VESTS")
self.assertEqual(
(tx["operations"][0][0]),
@@ -330,7 +330,7 @@ class Testcases(unittest.TestCase):
def test_claim_reward_balance(self):
w = self.account
- w.steem.txbuffer.clear()
+ w.hive.txbuffer.clear()
tx = w.claim_reward_balance()
self.assertEqual(
(tx["operations"][0][0]),
@@ -343,7 +343,7 @@ class Testcases(unittest.TestCase):
def test_cancel_transfer_from_savings(self):
w = self.account
- w.steem.txbuffer.clear()
+ w.hive.txbuffer.clear()
tx = w.cancel_transfer_from_savings(0)
self.assertEqual(
(tx["operations"][0][0]),
@@ -356,8 +356,8 @@ class Testcases(unittest.TestCase):
def test_transfer_from_savings(self):
w = self.account
- w.steem.txbuffer.clear()
- tx = w.transfer_from_savings(1, "STEEM", "")
+ w.hive.txbuffer.clear()
+ tx = w.transfer_from_savings(1, "HIVE", "")
self.assertEqual(
(tx["operations"][0][0]),
"transfer_from_savings"
@@ -369,8 +369,8 @@ class Testcases(unittest.TestCase):
def test_transfer_to_savings(self):
w = self.account
- w.steem.txbuffer.clear()
- tx = w.transfer_to_savings(1, "STEEM", "")
+ w.hive.txbuffer.clear()
+ tx = w.transfer_to_savings(1, "HIVE", "")
self.assertEqual(
(tx["operations"][0][0]),
"transfer_to_savings"
@@ -382,8 +382,8 @@ class Testcases(unittest.TestCase):
def test_convert(self):
w = self.account
- w.steem.txbuffer.clear()
- tx = w.convert("1 SBD")
+ w.hive.txbuffer.clear()
+ tx = w.convert("1 HBD")
self.assertEqual(
(tx["operations"][0][0]),
"convert"
@@ -395,8 +395,8 @@ class Testcases(unittest.TestCase):
def test_transfer_to_vesting(self):
w = self.account
- w.steem.txbuffer.clear()
- tx = w.transfer_to_vesting("1 STEEM")
+ w.hive.txbuffer.clear()
+ tx = w.transfer_to_vesting("1 HIVE")
self.assertEqual(
(tx["operations"][0][0]),
"transfer_to_vesting"
@@ -407,14 +407,14 @@ class Testcases(unittest.TestCase):
op["from"])
def test_json_export(self):
- account = Account("beembot", steem_instance=self.bts)
- if account.steem.rpc.get_use_appbase():
+ account = Account("beembot", hive_instance=self.bts)
+ if account.hive.rpc.get_use_appbase():
content = self.bts.rpc.find_accounts({'accounts': [account["name"]]}, api="database")["accounts"][0]
else:
content = self.bts.rpc.get_accounts([account["name"]])[0]
keys = list(content.keys())
json_content = account.json()
- exclude_list = ['owner_challenged', 'average_bandwidth'] # ['json_metadata', 'reputation', 'active_votes', 'savings_sbd_seconds']
+ exclude_list = ['owner_challenged', 'average_bandwidth'] # ['json_metadata', 'reputation', 'active_votes', 'savings_hbd_seconds']
for k in keys:
if k not in exclude_list:
if isinstance(content[k], dict) and isinstance(json_content[k], list):
@@ -425,9 +425,9 @@ class Testcases(unittest.TestCase):
def test_estimate_virtual_op_num(self):
stm = self.bts
- account = Account("gtg", steem_instance=stm)
+ account = Account("gtg", hive_instance=stm)
block_num = 21248120
- block = Block(block_num, steem_instance=stm)
+ block = Block(block_num, hive_instance=stm)
op_num1 = account.estimate_virtual_op_num(block.time(), stop_diff=1, max_count=100)
op_num2 = account.estimate_virtual_op_num(block_num, stop_diff=1, max_count=100)
op_num3 = account.estimate_virtual_op_num(block_num, stop_diff=100, max_count=100)
@@ -463,7 +463,7 @@ class Testcases(unittest.TestCase):
def test_history_votes(self):
stm = self.bts
- account = Account("gtg", steem_instance=stm)
+ account = Account("gtg", hive_instance=stm)
utc = pytz.timezone('UTC')
limit_time = utc.localize(datetime.utcnow()) - timedelta(days=2)
votes_list = []
@@ -486,7 +486,7 @@ class Testcases(unittest.TestCase):
self.assertTrue(comments[0].depth > 0)
def test_blog_history(self):
- account = Account("holger80", steem_instance=self.bts)
+ account = Account("holger80", hive_instance=self.bts)
posts = []
for p in account.blog_history(limit=5):
if p["author"] != account["name"]:
@@ -506,7 +506,7 @@ class Testcases(unittest.TestCase):
self.assertTrue(replies[0].is_comment())
self.assertTrue(replies[0].depth > 0)
- def test_get_vote_pct_for_SBD(self):
+ def test_get_vote_pct_for_HBD(self):
account = self.account
for vote_pwr in range(5, 100, 5):
- self.assertTrue(9900 <= account.get_vote_pct_for_SBD(account.get_voting_value_SBD(voting_power=vote_pwr), voting_power=vote_pwr) <= 11000)
+ self.assertTrue(9900 <= account.get_vote_pct_for_HBD(account.get_voting_value_HBD(voting_power=vote_pwr), voting_power=vote_pwr) <= 11000)
diff --git a/tests/beem/test_amount.py b/tests/beem/test_amount.py
index 664ef94ea47715539f19462d335889230f2c5fa7..7a7501123b7945b9eafd6c139e0ae64c5cb8a8ae 100644
--- a/tests/beem/test_amount.py
+++ b/tests/beem/test_amount.py
@@ -9,7 +9,7 @@ from beem import Steem
from beem.amount import Amount
from beem.asset import Asset
from beem.nodelist import NodeList
-from beem.instance import set_shared_steem_instance, SharedInstance
+from beem.instance import set_shared_hive_instance, SharedInstance
from decimal import Decimal
@@ -17,23 +17,23 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
num_retries=10
)
- cls.steemit = Steem(
- node="https://api.steemit.com",
+ cls.hiveit = Steem(
+ node="https://api.hiveit.com",
nobroadcast=True,
use_condenser=False,
num_retries=10
)
- set_shared_steem_instance(cls.bts)
- cls.asset = Asset("SBD")
+ set_shared_hive_instance(cls.bts)
+ cls.asset = Asset("HBD")
cls.symbol = cls.asset["symbol"]
cls.precision = cls.asset["precision"]
- cls.asset2 = Asset("STEEM")
+ cls.asset2 = Asset("HIVE")
def dotest(self, ret, amount, symbol):
self.assertEqual(float(ret), float(amount))
@@ -44,54 +44,54 @@ class Testcases(unittest.TestCase):
def test_init(self):
stm = self.bts
# String init
- asset = Asset("SBD", steem_instance=stm)
+ asset = Asset("HBD", hive_instance=stm)
symbol = asset["symbol"]
precision = asset["precision"]
- amount = Amount("1 {}".format(symbol), steem_instance=stm)
+ amount = Amount("1 {}".format(symbol), hive_instance=stm)
self.dotest(amount, 1, symbol)
# Amount init
- amount = Amount(amount, steem_instance=stm)
+ amount = Amount(amount, hive_instance=stm)
self.dotest(amount, 1, symbol)
# blockchain dict init
amount = Amount({
"amount": 1 * 10 ** precision,
"asset_id": asset["id"]
- }, steem_instance=stm)
+ }, hive_instance=stm)
self.dotest(amount, 1, symbol)
# API dict init
amount = Amount({
"amount": 1.3 * 10 ** precision,
"asset": asset["id"]
- }, steem_instance=stm)
+ }, hive_instance=stm)
self.dotest(amount, 1.3, symbol)
# Asset as symbol
- amount = Amount(1.3, Asset("SBD"), steem_instance=stm)
+ amount = Amount(1.3, Asset("HBD"), hive_instance=stm)
self.dotest(amount, 1.3, symbol)
# Asset as symbol
- amount = Amount(1.3, symbol, steem_instance=stm)
+ amount = Amount(1.3, symbol, hive_instance=stm)
self.dotest(amount, 1.3, symbol)
# keyword inits
- amount = Amount(amount=1.3, asset=Asset("SBD", steem_instance=stm), steem_instance=stm)
+ amount = Amount(amount=1.3, asset=Asset("HBD", hive_instance=stm), hive_instance=stm)
self.dotest(amount, 1.3, symbol)
- amount = Amount(amount=1.3001, asset=Asset("SBD", steem_instance=stm), steem_instance=stm)
+ amount = Amount(amount=1.3001, asset=Asset("HBD", hive_instance=stm), hive_instance=stm)
self.dotest(amount, 1.3001, symbol)
- amount = Amount(amount=1.3001, asset=Asset("SBD", steem_instance=stm), fixed_point_arithmetic=True, steem_instance=stm)
+ amount = Amount(amount=1.3001, asset=Asset("HBD", hive_instance=stm), fixed_point_arithmetic=True, hive_instance=stm)
self.dotest(amount, 1.3, symbol)
# keyword inits
- amount = Amount(amount=1.3, asset=dict(Asset("SBD", steem_instance=stm)), steem_instance=stm)
+ amount = Amount(amount=1.3, asset=dict(Asset("HBD", hive_instance=stm)), hive_instance=stm)
self.dotest(amount, 1.3, symbol)
# keyword inits
- amount = Amount(amount=1.3, asset=symbol, steem_instance=stm)
+ amount = Amount(amount=1.3, asset=symbol, hive_instance=stm)
self.dotest(amount, 1.3, symbol)
def test_copy(self):
@@ -112,24 +112,24 @@ class Testcases(unittest.TestCase):
(1.0, self.symbol))
def test_json_appbase(self):
- asset = Asset("SBD", steem_instance=self.bts)
- amount = Amount("1", asset, new_appbase_format=False, steem_instance=self.bts)
+ asset = Asset("HBD", hive_instance=self.bts)
+ amount = Amount("1", asset, new_appbase_format=False, hive_instance=self.bts)
if self.bts.rpc.get_use_appbase():
self.assertEqual(
amount.json(),
[str(1 * 10 ** asset.precision), asset.precision, asset.asset])
else:
- self.assertEqual(amount.json(), "1.000 SBD")
+ self.assertEqual(amount.json(), "1.000 HBD")
def test_json_appbase2(self):
- asset = Asset("SBD", steem_instance=self.bts)
- amount = Amount("1", asset, new_appbase_format=True, steem_instance=self.bts)
+ asset = Asset("HBD", hive_instance=self.bts)
+ amount = Amount("1", asset, new_appbase_format=True, hive_instance=self.bts)
if self.bts.rpc.get_use_appbase():
self.assertEqual(
amount.json(),
{'amount': str(1 * 10 ** asset.precision), 'nai': asset.asset, 'precision': asset.precision})
else:
- self.assertEqual(amount.json(), "1.000 SBD")
+ self.assertEqual(amount.json(), "1.000 HBD")
def test_string(self):
self.assertEqual(
@@ -153,7 +153,7 @@ class Testcases(unittest.TestCase):
int(Amount(int(1), self.symbol)),
1000)
self.assertEqual(
- int(Amount(amount=round(0.1509,3), asset=Asset("SBD"))),
+ int(Amount(amount=round(0.1509,3), asset=Asset("HBD"))),
151)
def test_dict(self):
diff --git a/tests/beem/test_asset.py b/tests/beem/test_asset.py
index f58b6c9bbbc66b6c3b5227cdd1eca0977d20915b..60333e3c457bfc4dea7e132898e5587cd0b32849 100644
--- a/tests/beem/test_asset.py
+++ b/tests/beem/test_asset.py
@@ -8,7 +8,7 @@ import unittest
from parameterized import parameterized
from beem import Steem
from beem.asset import Asset
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.exceptions import AssetDoesNotExistsException
from beem.nodelist import NodeList
@@ -17,37 +17,37 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
num_retries=10
)
- cls.steemit = Steem(
- node="https://api.steemit.com",
+ cls.hiveit = Steem(
+ node="https://api.hiveit.com",
nobroadcast=True,
num_retries=10
)
- set_shared_steem_instance(cls.bts)
+ set_shared_hive_instance(cls.bts)
@parameterized.expand([
("normal"),
- ("steemit"),
+ ("hiveit"),
])
def test_assert(self, node_param):
if node_param == "normal":
stm = self.bts
else:
- stm = self.steemit
+ stm = self.hiveit
with self.assertRaises(AssetDoesNotExistsException):
- Asset("FOObarNonExisting", full=False, steem_instance=stm)
+ Asset("FOObarNonExisting", full=False, hive_instance=stm)
@parameterized.expand([
- ("normal", "SBD", "SBD", 3, "@@000000013"),
- ("normal", "STEEM", "STEEM", 3, "@@000000021"),
+ ("normal", "HBD", "HBD", 3, "@@000000013"),
+ ("normal", "HIVE", "HIVE", 3, "@@000000021"),
("normal", "VESTS", "VESTS", 6, "@@000000037"),
- ("normal", "@@000000013", "SBD", 3, "@@000000013"),
- ("normal", "@@000000021", "STEEM", 3, "@@000000021"),
+ ("normal", "@@000000013", "HBD", 3, "@@000000013"),
+ ("normal", "@@000000021", "HIVE", 3, "@@000000021"),
("normal", "@@000000037", "VESTS", 6, "@@000000037"),
])
def test_properties(self, node_param, data, symbol_str, precision, asset_str):
@@ -55,39 +55,39 @@ class Testcases(unittest.TestCase):
stm = self.bts
else:
stm = self.testnet
- asset = Asset(data, full=False, steem_instance=stm)
+ asset = Asset(data, full=False, hive_instance=stm)
self.assertEqual(asset.symbol, symbol_str)
self.assertEqual(asset.precision, precision)
self.assertEqual(asset.asset, asset_str)
@parameterized.expand([
("normal"),
- ("steemit"),
+ ("hiveit"),
])
def test_assert_equal(self, node_param):
if node_param == "normal":
stm = self.bts
else:
- stm = self.steemit
- asset1 = Asset("SBD", full=False, steem_instance=stm)
- asset2 = Asset("SBD", full=False, steem_instance=stm)
+ stm = self.hiveit
+ asset1 = Asset("HBD", full=False, hive_instance=stm)
+ asset2 = Asset("HBD", full=False, hive_instance=stm)
self.assertTrue(asset1 == asset2)
- self.assertTrue(asset1 == "SBD")
- self.assertTrue(asset2 == "SBD")
- asset3 = Asset("STEEM", full=False, steem_instance=stm)
+ self.assertTrue(asset1 == "HBD")
+ self.assertTrue(asset2 == "HBD")
+ asset3 = Asset("HIVE", full=False, hive_instance=stm)
self.assertTrue(asset1 != asset3)
- self.assertTrue(asset3 != "SBD")
- self.assertTrue(asset1 != "STEEM")
+ self.assertTrue(asset3 != "HBD")
+ self.assertTrue(asset1 != "HIVE")
- a = {'asset': '@@000000021', 'precision': 3, 'id': 'STEEM', 'symbol': 'STEEM'}
- b = {'asset': '@@000000021', 'precision': 3, 'id': '@@000000021', 'symbol': 'STEEM'}
- self.assertTrue(Asset(a, steem_instance=stm) == Asset(b, steem_instance=stm))
+ a = {'asset': '@@000000021', 'precision': 3, 'id': 'HIVE', 'symbol': 'HIVE'}
+ b = {'asset': '@@000000021', 'precision': 3, 'id': '@@000000021', 'symbol': 'HIVE'}
+ self.assertTrue(Asset(a, hive_instance=stm) == Asset(b, hive_instance=stm))
"""
# Mocker comes from pytest-mock, providing an easy way to have patched objects
# for the life of the test.
def test_calls(mocker):
- asset = Asset("USD", lazy=True, steem_instance=Steem(offline=True))
+ asset = Asset("USD", lazy=True, hive_instance=Steem(offline=True))
method = mocker.patch.object(Asset, 'get_call_orders')
asset.calls
method.assert_called_with(10)
diff --git a/tests/beem/test_base_objects.py b/tests/beem/test_base_objects.py
index c2b23af2545769eeeda28c590e192dd0ed54885d..bd86c090eb13ad07650f49f1e42918af7e6f0db5 100644
--- a/tests/beem/test_base_objects.py
+++ b/tests/beem/test_base_objects.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
from builtins import super
import unittest
from beem import Steem, exceptions
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.account import Account
from beem.witness import Witness
from beem.nodelist import NodeList
@@ -15,13 +15,13 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
num_retries=10
)
- set_shared_steem_instance(cls.bts)
+ set_shared_hive_instance(cls.bts)
def test_Account(self):
with self.assertRaises(
diff --git a/tests/beem/test_block.py b/tests/beem/test_block.py
index d5f8c6127d1c9fb7e546b8d16e610ef0b7e078c5..caf5a2deb7bda37522a078076e767d3e92970c9d 100644
--- a/tests/beem/test_block.py
+++ b/tests/beem/test_block.py
@@ -9,7 +9,7 @@ from pprint import pprint
from beem import Steem, exceptions
from beem.block import Block, BlockHeader
from datetime import datetime
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.nodelist import NodeList
wif = "5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"
@@ -19,7 +19,7 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
@@ -29,13 +29,13 @@ class Testcases(unittest.TestCase):
cls.test_block_id = 19273700
# from getpass import getpass
# self.bts.wallet.unlock(getpass())
- set_shared_steem_instance(cls.bts)
+ set_shared_hive_instance(cls.bts)
cls.bts.set_default_account("test")
def test_block(self):
bts = self.bts
test_block_id = self.test_block_id
- block = Block(test_block_id, steem_instance=bts)
+ block = Block(test_block_id, hive_instance=bts)
self.assertEqual(block.identifier, test_block_id)
self.assertTrue(isinstance(block.time(), datetime))
self.assertTrue(isinstance(block, dict))
@@ -43,17 +43,17 @@ class Testcases(unittest.TestCase):
self.assertTrue(len(block.operations))
self.assertTrue(isinstance(block.ops_statistics(), dict))
- block2 = Block(test_block_id + 1, steem_instance=bts)
+ block2 = Block(test_block_id + 1, hive_instance=bts)
self.assertTrue(block2.time() > block.time())
with self.assertRaises(
exceptions.BlockDoesNotExistsException
):
- Block(0, steem_instance=bts)
+ Block(0, hive_instance=bts)
def test_block_only_ops(self):
bts = self.bts
test_block_id = self.test_block_id
- block = Block(test_block_id, only_ops=True, steem_instance=bts)
+ block = Block(test_block_id, only_ops=True, hive_instance=bts)
self.assertEqual(block.identifier, test_block_id)
self.assertTrue(isinstance(block.time(), datetime))
self.assertTrue(isinstance(block, dict))
@@ -61,27 +61,27 @@ class Testcases(unittest.TestCase):
self.assertTrue(len(block.operations))
self.assertTrue(isinstance(block.ops_statistics(), dict))
- block2 = Block(test_block_id + 1, steem_instance=bts)
+ block2 = Block(test_block_id + 1, hive_instance=bts)
self.assertTrue(block2.time() > block.time())
with self.assertRaises(
exceptions.BlockDoesNotExistsException
):
- Block(0, steem_instance=bts)
+ Block(0, hive_instance=bts)
def test_block_header(self):
bts = self.bts
test_block_id = self.test_block_id
- block = BlockHeader(test_block_id, steem_instance=bts)
+ block = BlockHeader(test_block_id, hive_instance=bts)
self.assertEqual(block.identifier, test_block_id)
self.assertTrue(isinstance(block.time(), datetime))
self.assertTrue(isinstance(block, dict))
- block2 = BlockHeader(test_block_id + 1, steem_instance=bts)
+ block2 = BlockHeader(test_block_id + 1, hive_instance=bts)
self.assertTrue(block2.time() > block.time())
with self.assertRaises(
exceptions.BlockDoesNotExistsException
):
- BlockHeader(0, steem_instance=bts)
+ BlockHeader(0, hive_instance=bts)
def test_export(self):
bts = self.bts
@@ -94,7 +94,7 @@ class Testcases(unittest.TestCase):
else:
block = bts.rpc.get_block(block_num)
- b = Block(block_num, steem_instance=bts)
+ b = Block(block_num, hive_instance=bts)
keys = list(block.keys())
json_content = b.json()
@@ -112,7 +112,7 @@ class Testcases(unittest.TestCase):
else:
block = bts.rpc.get_block_header(block_num)
- b = BlockHeader(block_num, steem_instance=bts)
+ b = BlockHeader(block_num, hive_instance=bts)
keys = list(block.keys())
json_content = b.json()
diff --git a/tests/beem/test_blockchain.py b/tests/beem/test_blockchain.py
index ddf0b29dc34706bdb65d61e8738b89899a109d21..23e3bd156d650d133f001b3f43f96667fecb4880 100644
--- a/tests/beem/test_blockchain.py
+++ b/tests/beem/test_blockchain.py
@@ -13,37 +13,37 @@ from beem import Steem
from beem.blockchain import Blockchain
from beem.exceptions import BlockWaitTimeExceeded
from beem.block import Block
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.nodelist import NodeList
from beembase.signedtransactions import Signed_Transaction
wif = "5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"
-nodes_appbase = ["https://api.steemitstage.com", "https://api.steem.house", "https://api.steemit.com"]
+nodes_appbase = ["https://api.hiveitstage.com", "https://api.hive.house", "https://api.hiveit.com"]
class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
keys={"active": wif},
num_retries=10
)
- b = Blockchain(steem_instance=cls.bts)
+ b = Blockchain(hive_instance=cls.bts)
num = b.get_current_block_num()
cls.start = num - 25
cls.stop = num
# from getpass import getpass
# self.bts.wallet.unlock(getpass())
- set_shared_steem_instance(cls.bts)
+ set_shared_hive_instance(cls.bts)
def test_blockchain(self):
bts = self.bts
- b = Blockchain(steem_instance=bts)
+ b = Blockchain(hive_instance=bts)
num = b.get_current_block_num()
self.assertTrue(num > 0)
self.assertTrue(isinstance(num, int))
@@ -58,10 +58,10 @@ class Testcases(unittest.TestCase):
def test_estimate_block_num(self):
bts = self.bts
- b = Blockchain(steem_instance=bts)
+ b = Blockchain(hive_instance=bts)
last_block = b.get_current_block()
num = last_block.identifier
- old_block = Block(num - 60, steem_instance=bts)
+ old_block = Block(num - 60, hive_instance=bts)
date = old_block.time()
est_block_num = b.get_estimated_block_num(date, accurate=False)
self.assertTrue((est_block_num - (old_block.identifier)) < 10)
@@ -73,7 +73,7 @@ class Testcases(unittest.TestCase):
def test_get_all_accounts(self):
bts = self.bts
- b = Blockchain(steem_instance=bts)
+ b = Blockchain(hive_instance=bts)
accounts = []
limit = 200
for acc in b.get_all_accounts(steps=100, limit=limit):
@@ -83,7 +83,7 @@ class Testcases(unittest.TestCase):
def test_awaitTX(self):
bts = self.bts
- b = Blockchain(steem_instance=bts)
+ b = Blockchain(hive_instance=bts)
trans = {'ref_block_num': 3855, 'ref_block_prefix': 1730859721,
'expiration': '2018-03-09T06:21:06', 'operations': [],
'extensions': [], 'signatures':
@@ -98,7 +98,7 @@ class Testcases(unittest.TestCase):
bts = self.bts
start = self.start
stop = self.stop
- b = Blockchain(steem_instance=bts)
+ b = Blockchain(hive_instance=bts)
ops_stream = []
opNames = ["transfer", "vote"]
for op in b.stream(opNames=opNames, start=start, stop=stop):
@@ -189,7 +189,7 @@ class Testcases(unittest.TestCase):
def test_stream2(self):
bts = self.bts
- b = Blockchain(steem_instance=bts)
+ b = Blockchain(hive_instance=bts)
stop_block = b.get_current_block_num()
start_block = stop_block - 10
ops_stream = []
@@ -199,7 +199,7 @@ class Testcases(unittest.TestCase):
def test_wait_for_and_get_block(self):
bts = self.bts
- b = Blockchain(steem_instance=bts, max_block_wait_repetition=18)
+ b = Blockchain(hive_instance=bts, max_block_wait_repetition=18)
start_num = b.get_current_block_num()
blocknum = start_num
last_fetched_block_num = None
@@ -209,7 +209,7 @@ class Testcases(unittest.TestCase):
blocknum = last_fetched_block_num + 1
self.assertEqual(last_fetched_block_num, start_num + 2)
- b2 = Blockchain(steem_instance=bts, max_block_wait_repetition=1)
+ b2 = Blockchain(hive_instance=bts, max_block_wait_repetition=1)
with self.assertRaises(
BlockWaitTimeExceeded
):
@@ -220,15 +220,15 @@ class Testcases(unittest.TestCase):
def test_hash_op(self):
bts = self.bts
- b = Blockchain(steem_instance=bts)
- op1 = {'type': 'vote_operation', 'value': {'voter': 'ubg', 'author': 'yesslife', 'permlink': 'steemit-sandwich-contest-week-25-2da-entry', 'weight': 100}}
- op2 = ['vote', {'voter': 'ubg', 'author': 'yesslife', 'permlink': 'steemit-sandwich-contest-week-25-2da-entry', 'weight': 100}]
+ b = Blockchain(hive_instance=bts)
+ op1 = {'type': 'vote_operation', 'value': {'voter': 'ubg', 'author': 'yesslife', 'permlink': 'hiveit-sandwich-contest-week-25-2da-entry', 'weight': 100}}
+ op2 = ['vote', {'voter': 'ubg', 'author': 'yesslife', 'permlink': 'hiveit-sandwich-contest-week-25-2da-entry', 'weight': 100}]
hash1 = b.hash_op(op1)
hash2 = b.hash_op(op2)
self.assertEqual(hash1, hash2)
def test_signing_appbase(self):
- b = Blockchain(steem_instance=self.bts)
+ b = Blockchain(hive_instance=self.bts)
st = None
for block in b.blocks(start=25304468, stop=25304468):
for trx in block.transactions:
diff --git a/tests/beem/test_blockchain_batch.py b/tests/beem/test_blockchain_batch.py
index 311eede37d483120b44694298ad5a40620c0597c..036010a2287312ea7526fa177dc2d43c42345e7c 100644
--- a/tests/beem/test_blockchain_batch.py
+++ b/tests/beem/test_blockchain_batch.py
@@ -12,7 +12,7 @@ from pprint import pprint
from beem import Steem
from beem.blockchain import Blockchain
from beem.block import Block
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.utils import formatTimeString
from beem.nodelist import NodeList
@@ -23,7 +23,7 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
@@ -34,10 +34,10 @@ class Testcases(unittest.TestCase):
)
# from getpass import getpass
# self.bts.wallet.unlock(getpass())
- set_shared_steem_instance(cls.bts)
+ set_shared_hive_instance(cls.bts)
cls.bts.set_default_account("test")
- b = Blockchain(steem_instance=cls.bts)
+ b = Blockchain(hive_instance=cls.bts)
num = b.get_current_block_num()
cls.start = num - 100
cls.stop = num
@@ -45,7 +45,7 @@ class Testcases(unittest.TestCase):
def test_stream_batch(self):
bts = self.bts
- b = Blockchain(steem_instance=bts)
+ b = Blockchain(hive_instance=bts)
ops_stream = []
opNames = ["transfer", "vote"]
for op in b.stream(opNames=opNames, start=self.start, stop=self.stop, max_batch_size=self.max_batch_size, threading=False):
@@ -77,7 +77,7 @@ class Testcases(unittest.TestCase):
def test_stream_batch2(self):
bts = self.bts
- b = Blockchain(steem_instance=bts)
+ b = Blockchain(hive_instance=bts)
ops_stream = []
start_block = 25097000
stop_block = 25097100
diff --git a/tests/beem/test_blockchain_threading.py b/tests/beem/test_blockchain_threading.py
index 3599dc8a47b598cce5ccea19234c45d41f58fea8..da81cf05d41901746340c74a49eec38a0306e832 100644
--- a/tests/beem/test_blockchain_threading.py
+++ b/tests/beem/test_blockchain_threading.py
@@ -12,7 +12,7 @@ from pprint import pprint
from beem import Steem
from beem.blockchain import Blockchain
from beem.block import Block
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.nodelist import NodeList
@@ -20,7 +20,7 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
@@ -29,10 +29,10 @@ class Testcases(unittest.TestCase):
)
# from getpass import getpass
# self.bts.wallet.unlock(getpass())
- set_shared_steem_instance(cls.bts)
+ set_shared_hive_instance(cls.bts)
cls.bts.set_default_account("test")
- b = Blockchain(steem_instance=cls.bts)
+ b = Blockchain(hive_instance=cls.bts)
num = b.get_current_block_num()
# num = 23346630
cls.start = num - 25
@@ -42,7 +42,7 @@ class Testcases(unittest.TestCase):
def test_block_threading(self):
bts = self.bts
- b = Blockchain(steem_instance=bts)
+ b = Blockchain(hive_instance=bts)
blocks_no_threading = []
for block in b.blocks(start=self.start, stop=self.stop, threading=False, thread_num=8):
blocks_no_threading.append(block)
@@ -58,7 +58,7 @@ class Testcases(unittest.TestCase):
def test_stream_threading(self):
bts = self.bts
- b = Blockchain(steem_instance=bts)
+ b = Blockchain(hive_instance=bts)
ops_stream_no_threading = []
opNames = ["transfer", "vote"]
@@ -86,7 +86,7 @@ class Testcases(unittest.TestCase):
def test_stream_threading2(self):
bts = self.bts
- b = Blockchain(steem_instance=bts)
+ b = Blockchain(hive_instance=bts)
ops_stream = []
start_block = 25097000
diff --git a/tests/beem/test_cli.py b/tests/beem/test_cli.py
index c155dd761ad38052eb8ab5d113190de82e871458..daed9e30be2841c7aeb10372fbe0f2126f09033c 100644
--- a/tests/beem/test_cli.py
+++ b/tests/beem/test_cli.py
@@ -14,7 +14,7 @@ from beem.account import Account
from beem.amount import Amount
from beemgraphenebase.account import PrivateKey
from beem.cli import cli, balance
-from beem.instance import set_shared_steem_instance, shared_steem_instance
+from beem.instance import set_shared_hive_instance, shared_hive_instance
from beembase.operationids import getOperationNameForId
from beem.nodelist import NodeList
@@ -29,10 +29,10 @@ class Testcases(unittest.TestCase):
def setUpClass(cls):
nodelist = NodeList()
nodelist.update_nodes()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_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 = shared_hive_instance()
# stm.config.refreshBackup()
runner = CliRunner()
result = runner.invoke(cli, ['-o', 'set', 'default_vote_weight', '100'])
@@ -59,7 +59,7 @@ class Testcases(unittest.TestCase):
@classmethod
def tearDownClass(cls):
- stm = shared_steem_instance()
+ stm = shared_hive_instance()
stm.config.recover_with_latest_backup()
def test_balance(self):
@@ -154,19 +154,19 @@ class Testcases(unittest.TestCase):
def test_upvote(self):
runner = CliRunner()
- result = runner.invoke(cli, ['-ds', 'upvote', '@steemit/firstpost'], input="test\n")
+ result = runner.invoke(cli, ['-ds', 'upvote', '@hiveit/firstpost'], input="test\n")
self.assertEqual(result.exit_code, 0)
- result = runner.invoke(cli, ['-ds', 'upvote', '--weight', '100', '@steemit/firstpost'], input="test\n")
+ result = runner.invoke(cli, ['-ds', 'upvote', '--weight', '100', '@hiveit/firstpost'], input="test\n")
self.assertEqual(result.exit_code, 0)
def test_downvote(self):
runner = CliRunner()
- result = runner.invoke(cli, ['-ds', 'downvote', '--weight', '100', '@steemit/firstpost'], input="test\n")
+ result = runner.invoke(cli, ['-ds', 'downvote', '--weight', '100', '@hiveit/firstpost'], input="test\n")
self.assertEqual(result.exit_code, 0)
def test_transfer(self):
runner = CliRunner()
- result = runner.invoke(cli, ['-ds', 'transfer', 'beembot', '1', 'SBD', 'test'], input="test\n")
+ result = runner.invoke(cli, ['-ds', 'transfer', 'beembot', '1', 'HBD', 'test'], input="test\n")
self.assertEqual(result.exit_code, 0)
def test_powerdownroute(self):
@@ -283,24 +283,24 @@ class Testcases(unittest.TestCase):
def test_buy(self):
runner = CliRunner()
- result = runner.invoke(cli, ['-ds', '-x', 'buy', '1', 'STEEM', '2.2'], input="test\n")
+ result = runner.invoke(cli, ['-ds', '-x', 'buy', '1', 'HIVE', '2.2'], input="test\n")
self.assertEqual(result.exit_code, 0)
- result = runner.invoke(cli, ['-ds', '-x', 'buy', '1', 'STEEM'], input="y\ntest\n")
+ result = runner.invoke(cli, ['-ds', '-x', 'buy', '1', 'HIVE'], input="y\ntest\n")
self.assertEqual(result.exit_code, 0)
- result = runner.invoke(cli, ['-ds', '-x', 'buy', '1', 'SBD', '2.2'], input="test\n")
+ result = runner.invoke(cli, ['-ds', '-x', 'buy', '1', 'HBD', '2.2'], input="test\n")
self.assertEqual(result.exit_code, 0)
- result = runner.invoke(cli, ['-ds', '-x', 'buy', '1', 'SBD'], input="y\ntest\n")
+ result = runner.invoke(cli, ['-ds', '-x', 'buy', '1', 'HBD'], input="y\ntest\n")
self.assertEqual(result.exit_code, 0)
def test_sell(self):
runner = CliRunner()
- result = runner.invoke(cli, ['-ds', '-x', 'sell', '1', 'STEEM', '2.2'], input="test\n")
+ result = runner.invoke(cli, ['-ds', '-x', 'sell', '1', 'HIVE', '2.2'], input="test\n")
self.assertEqual(result.exit_code, 0)
- result = runner.invoke(cli, ['-ds', '-x', 'sell', '1', 'SBD', '2.2'], input="test\n")
+ result = runner.invoke(cli, ['-ds', '-x', 'sell', '1', 'HBD', '2.2'], input="test\n")
self.assertEqual(result.exit_code, 0)
- result = runner.invoke(cli, ['-ds', '-x', 'sell', '1', 'STEEM'], input="y\ntest\n")
+ result = runner.invoke(cli, ['-ds', '-x', 'sell', '1', 'HIVE'], input="y\ntest\n")
self.assertEqual(result.exit_code, 0)
- result = runner.invoke(cli, ['-ds', '-x', 'sell', '1', 'SBD'], input="y\ntest\n")
+ result = runner.invoke(cli, ['-ds', '-x', 'sell', '1', 'HBD'], input="y\ntest\n")
self.assertEqual(result.exit_code, 0)
def test_cancel(self):
@@ -313,9 +313,9 @@ class Testcases(unittest.TestCase):
result = runner.invoke(cli, ['openorders'])
self.assertEqual(result.exit_code, 0)
- def test_resteem(self):
+ def test_rehive(self):
runner = CliRunner()
- result = runner.invoke(cli, ['-dso', 'resteem', '@steemit/firstposte'], input="test\n")
+ result = runner.invoke(cli, ['-dso', 'rehive', '@hiveit/firstposte'], input="test\n")
self.assertEqual(result.exit_code, 0)
def test_follow_unfollow(self):
@@ -338,7 +338,7 @@ class Testcases(unittest.TestCase):
def test_witnessupdate(self):
runner = CliRunner()
- runner.invoke(cli, ['-ds', 'witnessupdate', 'gtg', '--maximum_block_size', 65000, '--account_creation_fee', 0.1, '--sbd_interest_rate', 0, '--url', 'https://google.de', '--signing_key', wif])
+ runner.invoke(cli, ['-ds', 'witnessupdate', 'gtg', '--maximum_block_size', 65000, '--account_creation_fee', 0.1, '--hbd_interest_rate', 0, '--url', 'https://google.de', '--signing_key', wif])
def test_profile(self):
runner = CliRunner()
@@ -350,8 +350,8 @@ class Testcases(unittest.TestCase):
def test_claimreward(self):
runner = CliRunner()
result = runner.invoke(cli, ['-ds', 'claimreward'], input="test\n")
- result = runner.invoke(cli, ['-ds', 'claimreward', '--claim_all_steem'], input="test\n")
- result = runner.invoke(cli, ['-ds', 'claimreward', '--claim_all_sbd'], input="test\n")
+ result = runner.invoke(cli, ['-ds', 'claimreward', '--claim_all_hive'], input="test\n")
+ result = runner.invoke(cli, ['-ds', 'claimreward', '--claim_all_hbd'], input="test\n")
result = runner.invoke(cli, ['-ds', 'claimreward', '--claim_all_vests'], input="test\n")
self.assertEqual(result.exit_code, 0)
diff --git a/tests/beem/test_comment.py b/tests/beem/test_comment.py
index 35043b80a108fe2b3daea1aef53401d3e148854a..6d32196a45f18d2f75e3e8b0038073ec87e96080 100644
--- a/tests/beem/test_comment.py
+++ b/tests/beem/test_comment.py
@@ -10,7 +10,7 @@ from beem import Steem, exceptions
from beem.comment import Comment, RecentReplies, RecentByPath
from beem.vote import Vote
from beem.account import Account
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.utils import resolve_authorperm
from beem.nodelist import NodeList
@@ -21,7 +21,7 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
node_list = nodelist.get_nodes(exclude_limited=True)
cls.bts = Steem(
@@ -32,14 +32,14 @@ class Testcases(unittest.TestCase):
keys={"active": wif},
num_retries=10
)
- cls.steemit = Steem(
- node="https://api.steemit.com",
+ cls.hiveit = Steem(
+ node="https://api.hiveit.com",
nobroadcast=True,
unsigned=True,
keys={"active": wif},
num_retries=10
)
- acc = Account("holger80", steem_instance=cls.bts)
+ acc = Account("holger80", hive_instance=cls.bts)
comment = acc.get_feed(limit=20)[-1]
cls.authorperm = comment.authorperm
[author, permlink] = resolve_authorperm(cls.authorperm)
@@ -49,7 +49,7 @@ class Testcases(unittest.TestCase):
cls.title = comment.title
# from getpass import getpass
# self.bts.wallet.unlock(getpass())
- # set_shared_steem_instance(cls.bts)
+ # set_shared_hive_instance(cls.bts)
# cls.bts.set_default_account("test")
def test_comment(self):
@@ -57,15 +57,15 @@ class Testcases(unittest.TestCase):
with self.assertRaises(
exceptions.ContentDoesNotExistsException
):
- Comment("@abcdef/abcdef", steem_instance=bts)
+ Comment("@abcdef/abcdef", hive_instance=bts)
title = ''
cnt = 0
while title == '' and cnt < 5:
- c = Comment(self.authorperm, steem_instance=bts)
+ c = Comment(self.authorperm, hive_instance=bts)
title = c.title
cnt += 1
if title == '':
- c.steem.rpc.next()
+ c.hive.rpc.next()
c.refresh()
title = c.title
self.assertTrue(isinstance(c.id, int))
@@ -96,12 +96,12 @@ class Testcases(unittest.TestCase):
title = ''
cnt = 0
while title == '' and cnt < 5:
- c = Comment({'author': self.author, 'permlink': self.permlink}, steem_instance=bts)
+ c = Comment({'author': self.author, 'permlink': self.permlink}, hive_instance=bts)
c.refresh()
title = c.title
cnt += 1
if title == '':
- c.steem.rpc.next()
+ c.hive.rpc.next()
c.refresh()
title = c.title
@@ -115,7 +115,7 @@ class Testcases(unittest.TestCase):
def test_vote(self):
bts = self.bts
- c = Comment(self.authorperm, steem_instance=bts)
+ c = Comment(self.authorperm, hive_instance=bts)
bts.txbuffer.clear()
tx = c.vote(100, account="test")
self.assertEqual(
@@ -126,20 +126,20 @@ class Testcases(unittest.TestCase):
self.assertIn(
"test",
op["voter"])
- c.steem.txbuffer.clear()
+ c.hive.txbuffer.clear()
tx = c.upvote(weight=150, voter="test")
op = tx["operations"][0][1]
self.assertEqual(op["weight"], 10000)
- c.steem.txbuffer.clear()
+ c.hive.txbuffer.clear()
tx = c.upvote(weight=99.9, voter="test")
op = tx["operations"][0][1]
self.assertEqual(op["weight"], 9990)
- c.steem.txbuffer.clear()
+ c.hive.txbuffer.clear()
tx = c.downvote(weight=150, voter="test")
op = tx["operations"][0][1]
self.assertEqual(op["weight"], -10000)
- c.steem.txbuffer.clear()
+ c.hive.txbuffer.clear()
tx = c.downvote(weight=99.9, voter="test")
op = tx["operations"][0][1]
self.assertEqual(op["weight"], -9990)
@@ -152,7 +152,7 @@ class Testcases(unittest.TestCase):
else:
content = bts.rpc.get_content(self.author, self.permlink)
- c = Comment(self.authorperm, steem_instance=bts)
+ c = Comment(self.authorperm, hive_instance=bts)
keys = list(content.keys())
json_content = c.json()
exclude_list = ["json_metadata", "reputation", "active_votes"]
@@ -165,11 +165,11 @@ class Testcases(unittest.TestCase):
else:
self.assertEqual(content[k], json_content[k])
- def test_resteem(self):
+ def test_rehive(self):
bts = self.bts
bts.txbuffer.clear()
- c = Comment(self.authorperm, steem_instance=bts)
- tx = c.resteem(account="test")
+ c = Comment(self.authorperm, hive_instance=bts)
+ tx = c.rehive(account="test")
self.assertEqual(
(tx["operations"][0][0]),
"custom_json"
@@ -178,7 +178,7 @@ class Testcases(unittest.TestCase):
def test_reply(self):
bts = self.bts
bts.txbuffer.clear()
- c = Comment(self.authorperm, steem_instance=bts)
+ c = Comment(self.authorperm, hive_instance=bts)
tx = c.reply(body="Good post!", author="test")
self.assertEqual(
(tx["operations"][0][0]),
@@ -192,7 +192,7 @@ class Testcases(unittest.TestCase):
def test_delete(self):
bts = self.bts
bts.txbuffer.clear()
- c = Comment(self.authorperm, steem_instance=bts)
+ c = Comment(self.authorperm, hive_instance=bts)
tx = c.delete(account="test")
self.assertEqual(
(tx["operations"][0][0]),
@@ -206,7 +206,7 @@ class Testcases(unittest.TestCase):
def test_edit(self):
bts = self.bts
bts.txbuffer.clear()
- c = Comment(self.authorperm, steem_instance=bts)
+ c = Comment(self.authorperm, hive_instance=bts)
c.edit(c.body, replace=False)
body = c.body + "test"
tx = c.edit(body, replace=False)
@@ -222,7 +222,7 @@ class Testcases(unittest.TestCase):
def test_edit_replace(self):
bts = self.bts
bts.txbuffer.clear()
- c = Comment(self.authorperm, steem_instance=bts)
+ c = Comment(self.authorperm, hive_instance=bts)
body = c.body + "test"
tx = c.edit(body, meta=c["json_metadata"], replace=True)
self.assertEqual(
@@ -237,12 +237,12 @@ class Testcases(unittest.TestCase):
def test_recent_replies(self):
bts = self.bts
- r = RecentReplies(self.author, skip_own=True, steem_instance=bts)
+ r = RecentReplies(self.author, skip_own=True, hive_instance=bts)
self.assertTrue(len(r) > 0)
self.assertTrue(r[0] is not None)
def test_recent_by_path(self):
bts = self.bts
- r = RecentByPath(path="hot", steem_instance=bts)
+ r = RecentByPath(path="hot", hive_instance=bts)
self.assertTrue(len(r) > 0)
self.assertTrue(r[0] is not None)
diff --git a/tests/beem/test_connection.py b/tests/beem/test_connection.py
index 256f434e615420a6d58b52a4bb88a1598bf0a3f4..1a18794a23374aec1f926d145ce41a3e12ed3ee3 100644
--- a/tests/beem/test_connection.py
+++ b/tests/beem/test_connection.py
@@ -1,7 +1,7 @@
import unittest
from beem import Steem
from beem.account import Account
-from beem.instance import set_shared_steem_instance, SharedInstance
+from beem.instance import set_shared_hive_instance, SharedInstance
from beem.blockchainobject import BlockchainObject
from beem.nodelist import NodeList
@@ -13,9 +13,9 @@ class Testcases(unittest.TestCase):
def test_stm1stm2(self):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
b1 = Steem(
- node="https://api.steemit.com",
+ node="https://api.hiveit.com",
nobroadcast=True,
num_retries=10
)
@@ -31,12 +31,12 @@ class Testcases(unittest.TestCase):
def test_default_connection(self):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
b2 = Steem(
node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
)
- set_shared_steem_instance(b2)
+ set_shared_hive_instance(b2)
bts = Account("beem")
- self.assertEqual(bts.steem.prefix, "STM")
+ self.assertEqual(bts.hive.prefix, "STM")
diff --git a/tests/beem/test_constants.py b/tests/beem/test_constants.py
index 3b0e0a4e70133fc9860300e49b3671acbaddf2df..0b0debfdc44e85422474f2ab70a86bc820297ff7 100644
--- a/tests/beem/test_constants.py
+++ b/tests/beem/test_constants.py
@@ -21,7 +21,7 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.appbase = Steem(
node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
@@ -33,45 +33,45 @@ class Testcases(unittest.TestCase):
def test_constants(self):
stm = self.appbase
- steem_conf = stm.get_config()
- if "STEEM_100_PERCENT" in steem_conf:
- STEEM_100_PERCENT = steem_conf['STEEM_100_PERCENT']
+ hive_conf = stm.get_config()
+ if "HIVE_100_PERCENT" in hive_conf:
+ HIVE_100_PERCENT = hive_conf['HIVE_100_PERCENT']
else:
- STEEM_100_PERCENT = steem_conf['STEEMIT_100_PERCENT']
- self.assertEqual(constants.STEEM_100_PERCENT, STEEM_100_PERCENT)
+ HIVE_100_PERCENT = hive_conf['HIVEIT_100_PERCENT']
+ self.assertEqual(constants.HIVE_100_PERCENT, HIVE_100_PERCENT)
- if "STEEM_1_PERCENT" in steem_conf:
- STEEM_1_PERCENT = steem_conf['STEEM_1_PERCENT']
+ if "HIVE_1_PERCENT" in hive_conf:
+ HIVE_1_PERCENT = hive_conf['HIVE_1_PERCENT']
else:
- STEEM_1_PERCENT = steem_conf['STEEMIT_1_PERCENT']
- self.assertEqual(constants.STEEM_1_PERCENT, STEEM_1_PERCENT)
+ HIVE_1_PERCENT = hive_conf['HIVEIT_1_PERCENT']
+ self.assertEqual(constants.HIVE_1_PERCENT, HIVE_1_PERCENT)
- 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']
+ if "HIVE_REVERSE_AUCTION_WINDOW_SECONDS" in hive_conf:
+ HIVE_REVERSE_AUCTION_WINDOW_SECONDS = hive_conf['HIVE_REVERSE_AUCTION_WINDOW_SECONDS']
+ elif "HIVE_REVERSE_AUCTION_WINDOW_SECONDS_HF6" in hive_conf:
+ HIVE_REVERSE_AUCTION_WINDOW_SECONDS = hive_conf['HIVE_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)
+ HIVE_REVERSE_AUCTION_WINDOW_SECONDS = hive_conf['HIVEIT_REVERSE_AUCTION_WINDOW_SECONDS']
+ self.assertEqual(constants.HIVE_REVERSE_AUCTION_WINDOW_SECONDS_HF6, HIVE_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 "HIVE_REVERSE_AUCTION_WINDOW_SECONDS_HF20" in hive_conf:
+ self.assertEqual(constants.HIVE_REVERSE_AUCTION_WINDOW_SECONDS_HF20, hive_conf["HIVE_REVERSE_AUCTION_WINDOW_SECONDS_HF20"])
- if "STEEM_VOTE_DUST_THRESHOLD" in steem_conf:
- self.assertEqual(constants.STEEM_VOTE_DUST_THRESHOLD, steem_conf["STEEM_VOTE_DUST_THRESHOLD"])
+ if "HIVE_VOTE_DUST_THRESHOLD" in hive_conf:
+ self.assertEqual(constants.HIVE_VOTE_DUST_THRESHOLD, hive_conf["HIVE_VOTE_DUST_THRESHOLD"])
- 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)
+ if "HIVE_VOTE_REGENERATION_SECONDS" in hive_conf:
+ HIVE_VOTE_REGENERATION_SECONDS = hive_conf['HIVE_VOTE_REGENERATION_SECONDS']
+ self.assertEqual(constants.HIVE_VOTE_REGENERATION_SECONDS, HIVE_VOTE_REGENERATION_SECONDS)
+ elif "HIVE_VOTING_MANA_REGENERATION_SECONDS" in hive_conf:
+ HIVE_VOTING_MANA_REGENERATION_SECONDS = hive_conf["HIVE_VOTING_MANA_REGENERATION_SECONDS"]
+ self.assertEqual(constants.HIVE_VOTING_MANA_REGENERATION_SECONDS, HIVE_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)
+ HIVE_VOTE_REGENERATION_SECONDS = hive_conf['HIVEIT_VOTE_REGENERATION_SECONDS']
+ self.assertEqual(constants.HIVE_VOTE_REGENERATION_SECONDS, HIVE_VOTE_REGENERATION_SECONDS)
- if "STEEM_ROOT_POST_PARENT" in steem_conf:
- STEEM_ROOT_POST_PARENT = steem_conf['STEEM_ROOT_POST_PARENT']
+ if "HIVE_ROOT_POST_PARENT" in hive_conf:
+ HIVE_ROOT_POST_PARENT = hive_conf['HIVE_ROOT_POST_PARENT']
else:
- STEEM_ROOT_POST_PARENT = steem_conf['STEEMIT_ROOT_POST_PARENT']
- self.assertEqual(constants.STEEM_ROOT_POST_PARENT, STEEM_ROOT_POST_PARENT)
+ HIVE_ROOT_POST_PARENT = hive_conf['HIVEIT_ROOT_POST_PARENT']
+ self.assertEqual(constants.HIVE_ROOT_POST_PARENT, HIVE_ROOT_POST_PARENT)
diff --git a/tests/beem/test_conveyor.py b/tests/beem/test_conveyor.py
index aac0b2d93753aba062ed2d8f764fe05eeadc5c50..5410251802fc73a5a0bc4db38a7f5550d91f013b 100644
--- a/tests/beem/test_conveyor.py
+++ b/tests/beem/test_conveyor.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
import unittest
from beem import Steem
from beem.conveyor import Conveyor
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.nodelist import NodeList
wif = '5Jh1Gtu2j4Yi16TfhoDmg8Qj3ULcgRi7A49JXdfUUTVPkaFaRKz'
@@ -18,7 +18,7 @@ class Testcases(unittest.TestCase):
nodelist = NodeList()
stm = Steem(node=nodelist.get_nodes(), nobroadcast=True,
num_retries=10, expiration=120)
- set_shared_steem_instance(stm)
+ set_shared_hive_instance(stm)
def test_healthcheck(self):
health = Conveyor().healthcheck()
diff --git a/tests/beem/test_discussions.py b/tests/beem/test_discussions.py
index 0192f2122aa6e2856ff0b1c031a8f80be03c80fe..205c70eb47935a3364fb44dc3d00b126d0158780 100644
--- a/tests/beem/test_discussions.py
+++ b/tests/beem/test_discussions.py
@@ -15,7 +15,7 @@ from beem.discussions import (
Discussions_by_comments, Discussions_by_promoted, Discussions
)
from datetime import datetime
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.nodelist import NodeList
wif = "5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"
@@ -25,7 +25,7 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False, appbase=True), num_retries=10))
+ nodelist.update_nodes(hive_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(
@@ -37,23 +37,23 @@ class Testcases(unittest.TestCase):
)
# from getpass import getpass
# self.bts.wallet.unlock(getpass())
- set_shared_steem_instance(cls.bts)
+ set_shared_hive_instance(cls.bts)
cls.bts.set_default_account("test")
def test_trending(self):
bts = self.bts
query = Query()
query["limit"] = 10
- query["tag"] = "steemit"
- d = Discussions_by_trending(query, steem_instance=bts)
+ query["tag"] = "hiveit"
+ d = Discussions_by_trending(query, hive_instance=bts)
self.assertEqual(len(d), 10)
def test_comment_payout(self):
bts = self.bts
query = Query()
query["limit"] = 10
- query["tag"] = "steemit"
- d = Comment_discussions_by_payout(query, steem_instance=bts)
+ query["tag"] = "hiveit"
+ d = Comment_discussions_by_payout(query, hive_instance=bts)
self.assertEqual(len(d), 10)
def test_post_payout(self):
@@ -61,46 +61,46 @@ class Testcases(unittest.TestCase):
query = Query()
query["limit"] = 10
- query["tag"] = "steemit"
- d = Post_discussions_by_payout(query, steem_instance=bts)
+ query["tag"] = "hiveit"
+ d = Post_discussions_by_payout(query, hive_instance=bts)
self.assertEqual(len(d), 10)
def test_created(self):
bts = self.bts
query = Query()
query["limit"] = 10
- query["tag"] = "steemit"
- d = Discussions_by_created(query, steem_instance=bts)
+ query["tag"] = "hiveit"
+ d = Discussions_by_created(query, hive_instance=bts)
self.assertEqual(len(d), 10)
def test_active(self):
bts = self.bts
query = Query()
query["limit"] = 10
- query["tag"] = "steemit"
- d = Discussions_by_active(query, steem_instance=bts)
+ query["tag"] = "hiveit"
+ d = Discussions_by_active(query, hive_instance=bts)
self.assertEqual(len(d), 10)
def test_cashout(self):
bts = self.bts
query = Query(limit=10)
- Discussions_by_cashout(query, steem_instance=bts)
+ Discussions_by_cashout(query, hive_instance=bts)
# self.assertEqual(len(d), 10)
def test_votes(self):
bts = self.bts
query = Query()
query["limit"] = 10
- query["tag"] = "steemit"
- d = Discussions_by_votes(query, steem_instance=bts)
+ query["tag"] = "hiveit"
+ d = Discussions_by_votes(query, hive_instance=bts)
self.assertEqual(len(d), 10)
def test_children(self):
bts = self.bts
query = Query()
query["limit"] = 10
- query["tag"] = "steemit"
- d = Discussions_by_children(query, steem_instance=bts)
+ query["tag"] = "hiveit"
+ d = Discussions_by_children(query, hive_instance=bts)
self.assertEqual(len(d), 10)
def test_feed(self):
@@ -108,7 +108,7 @@ class Testcases(unittest.TestCase):
query = Query()
query["limit"] = 10
query["tag"] = "gtg"
- d = Discussions_by_feed(query, steem_instance=bts)
+ d = Discussions_by_feed(query, hive_instance=bts)
self.assertEqual(len(d), 10)
def test_blog(self):
@@ -116,7 +116,7 @@ class Testcases(unittest.TestCase):
query = Query()
query["limit"] = 10
query["tag"] = "gtg"
- d = Discussions_by_blog(query, steem_instance=bts)
+ d = Discussions_by_blog(query, hive_instance=bts)
self.assertEqual(len(d), 10)
def test_comments(self):
@@ -125,16 +125,16 @@ class Testcases(unittest.TestCase):
query["limit"] = 10
query["filter_tags"] = ["gtg"]
query["start_author"] = "gtg"
- d = Discussions_by_comments(query, steem_instance=bts)
+ d = Discussions_by_comments(query, hive_instance=bts)
self.assertEqual(len(d), 10)
def test_promoted(self):
bts = self.bts
query = Query()
query["limit"] = 1
- query["tag"] = "steemit"
- d = Discussions_by_promoted(query, steem_instance=bts)
- discussions = Discussions(steem_instance=bts)
+ query["tag"] = "hiveit"
+ d = Discussions_by_promoted(query, hive_instance=bts)
+ discussions = Discussions(hive_instance=bts)
d2 = []
for dd in discussions.get_discussions("promoted", query, limit=10):
d2.append(dd)
diff --git a/tests/beem/test_instance.py b/tests/beem/test_instance.py
index ec6a00d18ee407a135c0d99508b9b2dff91f910e..3ce51c49c85cb03ea2046be38e7c7827bb52a229 100644
--- a/tests/beem/test_instance.py
+++ b/tests/beem/test_instance.py
@@ -14,7 +14,7 @@ from beem import Steem
from beem.amount import Amount
from beem.witness import Witness
from beem.account import Account
-from beem.instance import set_shared_steem_instance, shared_steem_instance, set_shared_config
+from beem.instance import set_shared_hive_instance, shared_hive_instance, set_shared_config
from beem.blockchain import Blockchain
from beem.block import Block
from beem.market import Market
@@ -39,7 +39,7 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
cls.nodelist = NodeList()
- cls.nodelist.update_nodes(steem_instance=Steem(node=cls.nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ cls.nodelist.update_nodes(hive_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"])
@@ -51,8 +51,8 @@ class Testcases(unittest.TestCase):
nobroadcast=True,
num_retries=10
)
- set_shared_steem_instance(cls.bts)
- acc = Account("holger80", steem_instance=cls.bts)
+ set_shared_hive_instance(cls.bts)
+ acc = Account("holger80", hive_instance=cls.bts)
comment = acc.get_blog(limit=20)[-1]
cls.authorperm = comment.authorperm
votes = acc.get_account_votes()
@@ -66,24 +66,24 @@ class Testcases(unittest.TestCase):
@parameterized.expand([
("instance"),
- ("steem")
+ ("hive")
])
def test_account(self, node_param):
if node_param == "instance":
- set_shared_steem_instance(self.bts)
+ set_shared_hive_instance(self.bts)
acc = Account("test")
- self.assertIn(acc.steem.rpc.url, self.urls)
- self.assertIn(acc["balance"].steem.rpc.url, self.urls)
+ self.assertIn(acc.hive.rpc.url, self.urls)
+ self.assertIn(acc["balance"].hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
- Account("test", steem_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ Account("test", hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
else:
- set_shared_steem_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
stm = self.bts
- acc = Account("test", steem_instance=stm)
- self.assertIn(acc.steem.rpc.url, self.urls)
- self.assertIn(acc["balance"].steem.rpc.url, self.urls)
+ acc = Account("test", hive_instance=stm)
+ self.assertIn(acc.hive.rpc.url, self.urls)
+ self.assertIn(acc["balance"].hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
@@ -91,46 +91,46 @@ class Testcases(unittest.TestCase):
@parameterized.expand([
("instance"),
- ("steem")
+ ("hive")
])
def test_amount(self, node_param):
if node_param == "instance":
stm = Steem(node="https://abc.d", autoconnect=False, num_retries=1)
- set_shared_steem_instance(self.bts)
- o = Amount("1 SBD")
- self.assertIn(o.steem.rpc.url, self.urls)
+ set_shared_hive_instance(self.bts)
+ o = Amount("1 HBD")
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
- Amount("1 SBD", steem_instance=stm)
+ Amount("1 HBD", hive_instance=stm)
else:
- set_shared_steem_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
stm = self.bts
- o = Amount("1 SBD", steem_instance=stm)
- self.assertIn(o.steem.rpc.url, self.urls)
+ o = Amount("1 HBD", hive_instance=stm)
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
- Amount("1 SBD")
+ Amount("1 HBD")
@parameterized.expand([
("instance"),
- ("steem")
+ ("hive")
])
def test_block(self, node_param):
if node_param == "instance":
- set_shared_steem_instance(self.bts)
+ set_shared_hive_instance(self.bts)
o = Block(1)
- self.assertIn(o.steem.rpc.url, self.urls)
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
- Block(1, steem_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ Block(1, hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
else:
- set_shared_steem_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
stm = self.bts
- o = Block(1, steem_instance=stm)
- self.assertIn(o.steem.rpc.url, self.urls)
+ o = Block(1, hive_instance=stm)
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
@@ -138,22 +138,22 @@ class Testcases(unittest.TestCase):
@parameterized.expand([
("instance"),
- ("steem")
+ ("hive")
])
def test_blockchain(self, node_param):
if node_param == "instance":
- set_shared_steem_instance(self.bts)
+ set_shared_hive_instance(self.bts)
o = Blockchain()
- self.assertIn(o.steem.rpc.url, self.urls)
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
- Blockchain(steem_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ Blockchain(hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
else:
- set_shared_steem_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
stm = self.bts
- o = Blockchain(steem_instance=stm)
- self.assertIn(o.steem.rpc.url, self.urls)
+ o = Blockchain(hive_instance=stm)
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
@@ -161,22 +161,22 @@ class Testcases(unittest.TestCase):
@parameterized.expand([
("instance"),
- ("steem")
+ ("hive")
])
def test_comment(self, node_param):
if node_param == "instance":
- set_shared_steem_instance(self.bts)
+ set_shared_hive_instance(self.bts)
o = Comment(self.authorperm)
- self.assertIn(o.steem.rpc.url, self.urls)
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
- Comment(self.authorperm, steem_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ Comment(self.authorperm, hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
else:
- set_shared_steem_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
stm = self.bts
- o = Comment(self.authorperm, steem_instance=stm)
- self.assertIn(o.steem.rpc.url, self.urls)
+ o = Comment(self.authorperm, hive_instance=stm)
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
@@ -184,22 +184,22 @@ class Testcases(unittest.TestCase):
@parameterized.expand([
("instance"),
- ("steem")
+ ("hive")
])
def test_market(self, node_param):
if node_param == "instance":
- set_shared_steem_instance(self.bts)
+ set_shared_hive_instance(self.bts)
o = Market()
- self.assertIn(o.steem.rpc.url, self.urls)
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
- Market(steem_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ Market(hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
else:
- set_shared_steem_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
stm = self.bts
- o = Market(steem_instance=stm)
- self.assertIn(o.steem.rpc.url, self.urls)
+ o = Market(hive_instance=stm)
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
@@ -207,45 +207,45 @@ class Testcases(unittest.TestCase):
@parameterized.expand([
("instance"),
- ("steem")
+ ("hive")
])
def test_price(self, node_param):
if node_param == "instance":
- set_shared_steem_instance(self.bts)
- o = Price(10.0, "STEEM/SBD")
- self.assertIn(o.steem.rpc.url, self.urls)
+ set_shared_hive_instance(self.bts)
+ o = Price(10.0, "HIVE/HBD")
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
- Price(10.0, "STEEM/SBD", steem_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ Price(10.0, "HIVE/HBD", hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
else:
- set_shared_steem_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
stm = self.bts
- o = Price(10.0, "STEEM/SBD", steem_instance=stm)
- self.assertIn(o.steem.rpc.url, self.urls)
+ o = Price(10.0, "HIVE/HBD", hive_instance=stm)
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
- Price(10.0, "STEEM/SBD")
+ Price(10.0, "HIVE/HBD")
@parameterized.expand([
("instance"),
- ("steem")
+ ("hive")
])
def test_vote(self, node_param):
if node_param == "instance":
- set_shared_steem_instance(self.bts)
+ set_shared_hive_instance(self.bts)
o = Vote(self.authorpermvoter)
- self.assertIn(o.steem.rpc.url, self.urls)
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
- Vote(self.authorpermvoter, steem_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ Vote(self.authorpermvoter, hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
else:
- set_shared_steem_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
stm = self.bts
- o = Vote(self.authorpermvoter, steem_instance=stm)
- self.assertIn(o.steem.rpc.url, self.urls)
+ o = Vote(self.authorpermvoter, hive_instance=stm)
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
@@ -253,47 +253,47 @@ class Testcases(unittest.TestCase):
@parameterized.expand([
("instance"),
- ("steem")
+ ("hive")
])
def test_wallet(self, node_param):
if node_param == "instance":
- set_shared_steem_instance(self.bts)
+ set_shared_hive_instance(self.bts)
o = Wallet()
- self.assertIn(o.steem.rpc.url, self.urls)
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
- o = Wallet(steem_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
- o.steem.get_config()
+ o = Wallet(hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ o.hive.get_config()
else:
- set_shared_steem_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
stm = self.bts
- o = Wallet(steem_instance=stm)
- self.assertIn(o.steem.rpc.url, self.urls)
+ o = Wallet(hive_instance=stm)
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
o = Wallet()
- o.steem.get_config()
+ o.hive.get_config()
@parameterized.expand([
("instance"),
- ("steem")
+ ("hive")
])
def test_witness(self, node_param):
if node_param == "instance":
- set_shared_steem_instance(self.bts)
+ set_shared_hive_instance(self.bts)
o = Witness("gtg")
- self.assertIn(o.steem.rpc.url, self.urls)
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
- Witness("gtg", steem_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ Witness("gtg", hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
else:
- set_shared_steem_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
stm = self.bts
- o = Witness("gtg", steem_instance=stm)
- self.assertIn(o.steem.rpc.url, self.urls)
+ o = Witness("gtg", hive_instance=stm)
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
@@ -301,36 +301,36 @@ class Testcases(unittest.TestCase):
@parameterized.expand([
("instance"),
- ("steem")
+ ("hive")
])
def test_transactionbuilder(self, node_param):
if node_param == "instance":
- set_shared_steem_instance(self.bts)
+ set_shared_hive_instance(self.bts)
o = TransactionBuilder()
- self.assertIn(o.steem.rpc.url, self.urls)
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
- o = TransactionBuilder(steem_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
- o.steem.get_config()
+ o = TransactionBuilder(hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ o.hive.get_config()
else:
- set_shared_steem_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
stm = self.bts
- o = TransactionBuilder(steem_instance=stm)
- self.assertIn(o.steem.rpc.url, self.urls)
+ o = TransactionBuilder(hive_instance=stm)
+ self.assertIn(o.hive.rpc.url, self.urls)
with self.assertRaises(
RPCConnection
):
o = TransactionBuilder()
- o.steem.get_config()
+ o.hive.get_config()
@parameterized.expand([
("instance"),
- ("steem")
+ ("hive")
])
- def test_steem(self, node_param):
+ def test_hive(self, node_param):
if node_param == "instance":
- set_shared_steem_instance(self.bts)
+ set_shared_hive_instance(self.bts)
o = Steem(node=self.urls)
o.get_config()
self.assertIn(o.rpc.url, self.urls)
@@ -340,7 +340,7 @@ class Testcases(unittest.TestCase):
stm = Steem(node="https://abc.d", autoconnect=False, num_retries=1)
stm.get_config()
else:
- set_shared_steem_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+ set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
stm = self.bts
o = stm
o.get_config()
@@ -348,11 +348,11 @@ class Testcases(unittest.TestCase):
with self.assertRaises(
RPCConnection
):
- stm = shared_steem_instance()
+ stm = shared_hive_instance()
stm.get_config()
def test_config(self):
set_shared_config({"node": self.urls})
- set_shared_steem_instance(None)
- o = shared_steem_instance()
+ set_shared_hive_instance(None)
+ o = shared_hive_instance()
self.assertIn(o.rpc.url, self.urls)
diff --git a/tests/beem/test_market.py b/tests/beem/test_market.py
index cf155828b664b415f3bea061e7b13a0f122505c6..fd72f1a8f77efeb1ab62ab3940169ed71d454e84 100644
--- a/tests/beem/test_market.py
+++ b/tests/beem/test_market.py
@@ -11,7 +11,7 @@ from beem.market import Market
from beem.price import Price
from beem.asset import Asset
from beem.amount import Amount
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.nodelist import NodeList
wif = "5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"
@@ -22,7 +22,7 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
@@ -32,42 +32,42 @@ class Testcases(unittest.TestCase):
)
# from getpass import getpass
# self.bts.wallet.unlock(getpass())
- set_shared_steem_instance(cls.bts)
+ set_shared_hive_instance(cls.bts)
cls.bts.set_default_account("test")
def test_market(self):
bts = self.bts
- m1 = Market(u'STEEM', u'SBD', steem_instance=bts)
- self.assertEqual(m1.get_string(), u'SBD:STEEM')
- m2 = Market(steem_instance=bts)
- self.assertEqual(m2.get_string(), u'SBD:STEEM')
- m3 = Market(u'STEEM:SBD', steem_instance=bts)
- self.assertEqual(m3.get_string(), u'STEEM:SBD')
+ m1 = Market(u'HIVE', u'HBD', hive_instance=bts)
+ self.assertEqual(m1.get_string(), u'HBD:HIVE')
+ m2 = Market(hive_instance=bts)
+ self.assertEqual(m2.get_string(), u'HBD:HIVE')
+ m3 = Market(u'HIVE:HBD', hive_instance=bts)
+ self.assertEqual(m3.get_string(), u'HIVE:HBD')
self.assertTrue(m1 == m2)
- base = Asset("SBD", steem_instance=bts)
- quote = Asset("STEEM", steem_instance=bts)
- m = Market(base, quote, steem_instance=bts)
- self.assertEqual(m.get_string(), u'STEEM:SBD')
+ base = Asset("HBD", hive_instance=bts)
+ quote = Asset("HIVE", hive_instance=bts)
+ m = Market(base, quote, hive_instance=bts)
+ self.assertEqual(m.get_string(), u'HIVE:HBD')
def test_ticker(self):
bts = self.bts
- m = Market(u'STEEM:SBD', steem_instance=bts)
+ m = Market(u'HIVE:HBD', hive_instance=bts)
ticker = m.ticker()
self.assertEqual(len(ticker), 6)
- self.assertEqual(ticker['steem_volume']["symbol"], u'STEEM')
- self.assertEqual(ticker['sbd_volume']["symbol"], u'SBD')
+ self.assertEqual(ticker['hive_volume']["symbol"], u'HIVE')
+ self.assertEqual(ticker['hbd_volume']["symbol"], u'HBD')
def test_volume(self):
bts = self.bts
- m = Market(u'STEEM:SBD', steem_instance=bts)
+ m = Market(u'HIVE:HBD', hive_instance=bts)
volume = m.volume24h()
- self.assertEqual(volume['STEEM']["symbol"], u'STEEM')
- self.assertEqual(volume['SBD']["symbol"], u'SBD')
+ self.assertEqual(volume['HIVE']["symbol"], u'HIVE')
+ self.assertEqual(volume['HBD']["symbol"], u'HBD')
def test_orderbook(self):
bts = self.bts
- m = Market(u'STEEM:SBD', steem_instance=bts)
+ m = Market(u'HIVE:HBD', hive_instance=bts)
orderbook = m.orderbook(limit=10)
self.assertEqual(len(orderbook['asks_date']), 10)
self.assertEqual(len(orderbook['asks']), 10)
@@ -76,7 +76,7 @@ class Testcases(unittest.TestCase):
def test_recenttrades(self):
bts = self.bts
- m = Market(u'STEEM:SBD', steem_instance=bts)
+ m = Market(u'HIVE:HBD', hive_instance=bts)
recenttrades = m.recent_trades(limit=10)
recenttrades_raw = m.recent_trades(limit=10, raw_data=True)
self.assertEqual(len(recenttrades), 10)
@@ -84,7 +84,7 @@ class Testcases(unittest.TestCase):
def test_trades(self):
bts = self.bts
- m = Market(u'STEEM:SBD', steem_instance=bts)
+ m = Market(u'HIVE:HBD', hive_instance=bts)
trades = m.trades(limit=10)
trades_raw = m.trades(limit=10, raw_data=True)
trades_history = m.trade_history(limit=10)
@@ -94,20 +94,20 @@ class Testcases(unittest.TestCase):
def test_market_history(self):
bts = self.bts
- m = Market(u'STEEM:SBD', steem_instance=bts)
+ m = Market(u'HIVE:HBD', hive_instance=bts)
buckets = m.market_history_buckets()
history = m.market_history(buckets[2])
self.assertTrue(len(history) > 0)
def test_accountopenorders(self):
bts = self.bts
- m = Market(u'STEEM:SBD', steem_instance=bts)
+ m = Market(u'HIVE:HBD', hive_instance=bts)
openOrder = m.accountopenorders("test")
self.assertTrue(isinstance(openOrder, list))
def test_buy(self):
bts = self.bts
- m = Market(u'STEEM:SBD', steem_instance=bts)
+ m = Market(u'HIVE:HBD', hive_instance=bts)
bts.txbuffer.clear()
tx = m.buy(5, 0.1, account="test")
self.assertEqual(
@@ -116,26 +116,26 @@ class Testcases(unittest.TestCase):
)
op = tx["operations"][0][1]
self.assertIn("test", op["owner"])
- self.assertEqual(str(Amount('0.100 STEEM', steem_instance=bts)), op["min_to_receive"])
- self.assertEqual(str(Amount('0.500 SBD', steem_instance=bts)), op["amount_to_sell"])
+ self.assertEqual(str(Amount('0.100 HIVE', hive_instance=bts)), op["min_to_receive"])
+ self.assertEqual(str(Amount('0.500 HBD', hive_instance=bts)), op["amount_to_sell"])
- p = Price(5, u"SBD:STEEM", steem_instance=bts)
+ p = Price(5, u"HBD:HIVE", hive_instance=bts)
tx = m.buy(p, 0.1, account="test")
op = tx["operations"][0][1]
- self.assertEqual(str(Amount('0.100 STEEM', steem_instance=bts)), op["min_to_receive"])
- self.assertEqual(str(Amount('0.500 SBD', steem_instance=bts)), op["amount_to_sell"])
+ self.assertEqual(str(Amount('0.100 HIVE', hive_instance=bts)), op["min_to_receive"])
+ self.assertEqual(str(Amount('0.500 HBD', hive_instance=bts)), op["amount_to_sell"])
- p = Price(5, u"SBD:STEEM", steem_instance=bts)
- a = Amount(0.1, "STEEM", steem_instance=bts)
+ p = Price(5, u"HBD:HIVE", hive_instance=bts)
+ a = Amount(0.1, "HIVE", hive_instance=bts)
tx = m.buy(p, a, account="test")
op = tx["operations"][0][1]
self.assertEqual(str(a), op["min_to_receive"])
- self.assertEqual(str(Amount('0.500 SBD', steem_instance=bts)), op["amount_to_sell"])
+ self.assertEqual(str(Amount('0.500 HBD', hive_instance=bts)), op["amount_to_sell"])
def test_sell(self):
bts = self.bts
bts.txbuffer.clear()
- m = Market(u'STEEM:SBD', steem_instance=bts)
+ m = Market(u'HIVE:HBD', hive_instance=bts)
tx = m.sell(5, 0.1, account="test")
self.assertEqual(
(tx["operations"][0][0]),
@@ -143,26 +143,26 @@ class Testcases(unittest.TestCase):
)
op = tx["operations"][0][1]
self.assertIn("test", op["owner"])
- self.assertEqual(str(Amount('0.500 SBD', steem_instance=bts)), op["min_to_receive"])
- self.assertEqual(str(Amount('0.100 STEEM', steem_instance=bts)), op["amount_to_sell"])
+ self.assertEqual(str(Amount('0.500 HBD', hive_instance=bts)), op["min_to_receive"])
+ self.assertEqual(str(Amount('0.100 HIVE', hive_instance=bts)), op["amount_to_sell"])
- p = Price(5, u"SBD:STEEM")
+ p = Price(5, u"HBD:HIVE")
tx = m.sell(p, 0.1, account="test")
op = tx["operations"][0][1]
- self.assertEqual(str(Amount('0.500 SBD', steem_instance=bts)), op["min_to_receive"])
- self.assertEqual(str(Amount('0.100 STEEM', steem_instance=bts)), op["amount_to_sell"])
+ self.assertEqual(str(Amount('0.500 HBD', hive_instance=bts)), op["min_to_receive"])
+ self.assertEqual(str(Amount('0.100 HIVE', hive_instance=bts)), op["amount_to_sell"])
- p = Price(5, u"SBD:STEEM", steem_instance=bts)
- a = Amount(0.1, "STEEM", steem_instance=bts)
+ p = Price(5, u"HBD:HIVE", hive_instance=bts)
+ a = Amount(0.1, "HIVE", hive_instance=bts)
tx = m.sell(p, a, account="test")
op = tx["operations"][0][1]
- self.assertEqual(str(Amount('0.500 SBD', steem_instance=bts)), op["min_to_receive"])
- self.assertEqual(str(Amount('0.100 STEEM', steem_instance=bts)), op["amount_to_sell"])
+ self.assertEqual(str(Amount('0.500 HBD', hive_instance=bts)), op["min_to_receive"])
+ self.assertEqual(str(Amount('0.100 HIVE', hive_instance=bts)), op["amount_to_sell"])
def test_cancel(self):
bts = self.bts
bts.txbuffer.clear()
- m = Market(u'STEEM:SBD', steem_instance=bts)
+ m = Market(u'HIVE:HBD', hive_instance=bts)
tx = m.cancel(5, account="test")
self.assertEqual(
(tx["operations"][0][0]),
@@ -173,8 +173,8 @@ class Testcases(unittest.TestCase):
"test",
op["owner"])
- def test_steem_usb_impied(self):
+ def test_hive_usb_impied(self):
bts = self.bts
- m = Market(u'STEEM:SBD', steem_instance=bts)
- steem_usd = m.steem_usd_implied()
- self.assertGreater(steem_usd, 0)
+ m = Market(u'HIVE:HBD', hive_instance=bts)
+ hive_usd = m.hive_usd_implied()
+ self.assertGreater(hive_usd, 0)
diff --git a/tests/beem/test_message.py b/tests/beem/test_message.py
index 5529ec4bbf1821ccddae02c8d7e89a122ba1300d..a5fa27b655396bb3f8bda99591e202e46fa48cc0 100644
--- a/tests/beem/test_message.py
+++ b/tests/beem/test_message.py
@@ -4,7 +4,7 @@ import mock
from beem import Steem
from beem.message import Message
from beem.account import Account
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.nodelist import NodeList
wif = "5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"
@@ -16,14 +16,14 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
keys=[wif],
num_retries=10
)
- set_shared_steem_instance(cls.bts)
+ set_shared_hive_instance(cls.bts)
def test_sign_message(self):
def new_refresh(self):
@@ -59,7 +59,7 @@ class Testcases(unittest.TestCase):
new=new_refresh
):
Message(
- "-----BEGIN STEEM SIGNED MESSAGE-----\n"
+ "-----BEGIN HIVE SIGNED MESSAGE-----\n"
"message foobar\n"
"-----BEGIN META-----\n"
"account=test\n"
@@ -68,11 +68,11 @@ class Testcases(unittest.TestCase):
"timestamp=2018-02-15T22:00:54\n"
"-----BEGIN SIGNATURE-----\n"
"20093ef63f375b9aa8570188cae3aad953bf6393d43ce6f03bbbd1b429e48c6a587dc012922515f6d327158df5081ea2d595888225f9f1c6c3028781c8f9451fde\n"
- "-----END STEEM SIGNED MESSAGE-----\n"
+ "-----END HIVE SIGNED MESSAGE-----\n"
).verify()
Message(
- "-----BEGIN STEEM SIGNED MESSAGE-----"
+ "-----BEGIN HIVE SIGNED MESSAGE-----"
"message foobar\n"
"-----BEGIN META-----"
"account=test\n"
@@ -81,5 +81,5 @@ class Testcases(unittest.TestCase):
"timestamp=2018-02-15T22:00:54\n"
"-----BEGIN SIGNATURE-----"
"20093ef63f375b9aa8570188cae3aad953bf6393d43ce6f03bbbd1b429e48c6a587dc012922515f6d327158df5081ea2d595888225f9f1c6c3028781c8f9451fde\n"
- "-----END STEEM SIGNED MESSAGE-----"
+ "-----END HIVE SIGNED MESSAGE-----"
).verify()
diff --git a/tests/beem/test_nodelist.py b/tests/beem/test_nodelist.py
index bac38449d3813584971f829c4e5998a114a12b07..af5804aff1d76e4d46e7b55b07a967703263cbb5 100644
--- a/tests/beem/test_nodelist.py
+++ b/tests/beem/test_nodelist.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
from builtins import super
import unittest
from beem import Steem, exceptions
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.account import Account
from beem.nodelist import NodeList
@@ -19,7 +19,7 @@ class Testcases(unittest.TestCase):
nobroadcast=True,
num_retries=10
)
- set_shared_steem_instance(cls.bts)
+ set_shared_hive_instance(cls.bts)
def test_get_nodes(self):
nodelist = NodeList()
@@ -31,6 +31,6 @@ class Testcases(unittest.TestCase):
def test_nodes_update(self):
nodelist = NodeList()
all_nodes = nodelist.get_nodes(exclude_limited=False, dev=True, testnet=True)
- nodelist.update_nodes(steem_instance=self.bts)
+ nodelist.update_nodes(hive_instance=self.bts)
nodes = nodelist.get_nodes()
self.assertIn(nodes[0], all_nodes)
diff --git a/tests/beem/test_objectcache.py b/tests/beem/test_objectcache.py
index 4c2a60907ae957fe2b951ce5aac03f61cdb01c6f..ede9c18cb50e6b86c873f3c422da5a10bc55c3da 100644
--- a/tests/beem/test_objectcache.py
+++ b/tests/beem/test_objectcache.py
@@ -7,7 +7,7 @@ from builtins import str
import time
import unittest
from beem import Steem, exceptions
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.blockchainobject import ObjectCache
from beem.account import Account
from beem.nodelist import NodeList
diff --git a/tests/beem/test_price.py b/tests/beem/test_price.py
index dbd3fafd596d79b26ffd5c841226bf2206daf246..d8a59f6f483f664feb2803dd17b66112d1cc5f0c 100644
--- a/tests/beem/test_price.py
+++ b/tests/beem/test_price.py
@@ -3,7 +3,7 @@ from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
from beem import Steem
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.amount import Amount
from beem.price import Price, Order, FilledOrder
from beem.asset import Asset
@@ -15,80 +15,80 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
- steem = Steem(
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ hive = Steem(
node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
num_retries=10
)
- set_shared_steem_instance(steem)
+ set_shared_hive_instance(hive)
def test_init(self):
# self.assertEqual(1, 1)
- Price("0.315 STEEM/SBD")
- Price(1.0, "STEEM/SBD")
- Price(0.315, base="STEEM", quote="SBD")
- Price(0.315, base=Asset("STEEM"), quote=Asset("SBD"))
+ Price("0.315 HIVE/HBD")
+ Price(1.0, "HIVE/HBD")
+ Price(0.315, base="HIVE", quote="HBD")
+ Price(0.315, base=Asset("HIVE"), quote=Asset("HBD"))
Price({
- "base": {"amount": 1, "asset_id": "SBD"},
- "quote": {"amount": 10, "asset_id": "STEEM"}})
- Price("", quote="10 SBD", base="1 STEEM")
- Price("10 SBD", "1 STEEM")
- Price(Amount("10 SBD"), Amount("1 STEEM"))
+ "base": {"amount": 1, "asset_id": "HBD"},
+ "quote": {"amount": 10, "asset_id": "HIVE"}})
+ Price("", quote="10 HBD", base="1 HIVE")
+ Price("10 HBD", "1 HIVE")
+ Price(Amount("10 HBD"), Amount("1 HIVE"))
def test_multiplication(self):
- p1 = Price(10.0, "STEEM/SBD")
- p2 = Price(5.0, "VESTS/STEEM")
+ p1 = Price(10.0, "HIVE/HBD")
+ p2 = Price(5.0, "VESTS/HIVE")
p3 = p1 * p2
- p4 = p3.as_base("SBD")
+ p4 = p3.as_base("HBD")
p4_2 = p3.as_quote("VESTS")
self.assertEqual(p4["quote"]["symbol"], "VESTS")
- self.assertEqual(p4["base"]["symbol"], "SBD")
- # 10 STEEM/SBD * 0.2 VESTS/STEEM = 50 VESTS/SBD = 0.02 SBD/VESTS
+ self.assertEqual(p4["base"]["symbol"], "HBD")
+ # 10 HIVE/HBD * 0.2 VESTS/HIVE = 50 VESTS/HBD = 0.02 HBD/VESTS
self.assertEqual(float(p4), 0.02)
self.assertEqual(p4_2["quote"]["symbol"], "VESTS")
- self.assertEqual(p4_2["base"]["symbol"], "SBD")
+ self.assertEqual(p4_2["base"]["symbol"], "HBD")
self.assertEqual(float(p4_2), 0.02)
p3 = p1 * 5
self.assertEqual(float(p3), 50)
# Inline multiplication
- p5 = Price(10.0, "STEEM/SBD")
+ p5 = Price(10.0, "HIVE/HBD")
p5 *= p2
- p4 = p5.as_base("SBD")
+ p4 = p5.as_base("HBD")
self.assertEqual(p4["quote"]["symbol"], "VESTS")
- self.assertEqual(p4["base"]["symbol"], "SBD")
- # 10 STEEM/SBD * 0.2 VESTS/STEEM = 2 VESTS/SBD = 0.02 SBD/VESTS
+ self.assertEqual(p4["base"]["symbol"], "HBD")
+ # 10 HIVE/HBD * 0.2 VESTS/HIVE = 2 VESTS/HBD = 0.02 HBD/VESTS
self.assertEqual(float(p4), 0.02)
- p6 = Price(10.0, "STEEM/SBD")
+ p6 = Price(10.0, "HIVE/HBD")
p6 *= 5
self.assertEqual(float(p6), 50)
def test_div(self):
- p1 = Price(10.0, "STEEM/SBD")
- p2 = Price(5.0, "STEEM/VESTS")
+ p1 = Price(10.0, "HIVE/HBD")
+ p2 = Price(5.0, "HIVE/VESTS")
- # 10 STEEM/SBD / 5 STEEM/VESTS = 2 VESTS/SBD
+ # 10 HIVE/HBD / 5 HIVE/VESTS = 2 VESTS/HBD
p3 = p1 / p2
p4 = p3.as_base("VESTS")
self.assertEqual(p4["base"]["symbol"], "VESTS")
- self.assertEqual(p4["quote"]["symbol"], "SBD")
- # 10 STEEM/SBD * 0.2 VESTS/STEEM = 2 VESTS/SBD = 0.5 SBD/VESTS
+ self.assertEqual(p4["quote"]["symbol"], "HBD")
+ # 10 HIVE/HBD * 0.2 VESTS/HIVE = 2 VESTS/HBD = 0.5 HBD/VESTS
self.assertEqual(float(p4), 2)
def test_div2(self):
- p1 = Price(10.0, "STEEM/SBD")
- p2 = Price(5.0, "STEEM/SBD")
+ p1 = Price(10.0, "HIVE/HBD")
+ p2 = Price(5.0, "HIVE/HBD")
- # 10 STEEM/SBD / 5 STEEM/VESTS = 2 VESTS/SBD
+ # 10 HIVE/HBD / 5 HIVE/VESTS = 2 VESTS/HBD
p3 = p1 / p2
self.assertTrue(isinstance(p3, (float, int)))
self.assertEqual(float(p3), 2.0)
p3 = p1 / 5
self.assertEqual(float(p3), 2.0)
- p3 = p1 / Amount("1 SBD")
+ p3 = p1 / Amount("1 HBD")
self.assertEqual(float(p3), 0.1)
p3 = p1
p3 /= p2
@@ -98,8 +98,8 @@ class Testcases(unittest.TestCase):
self.assertEqual(float(p3), 2.0)
def test_ltge(self):
- p1 = Price(10.0, "STEEM/SBD")
- p2 = Price(5.0, "STEEM/SBD")
+ p1 = Price(10.0, "HIVE/HBD")
+ p2 = Price(5.0, "HIVE/HBD")
self.assertTrue(p1 > p2)
self.assertTrue(p2 < p1)
@@ -107,8 +107,8 @@ class Testcases(unittest.TestCase):
self.assertTrue(p2 < 10)
def test_leeq(self):
- p1 = Price(10.0, "STEEM/SBD")
- p2 = Price(5.0, "STEEM/SBD")
+ p1 = Price(10.0, "HIVE/HBD")
+ p2 = Price(5.0, "HIVE/HBD")
self.assertTrue(p1 >= p2)
self.assertTrue(p2 <= p1)
@@ -116,8 +116,8 @@ class Testcases(unittest.TestCase):
self.assertTrue(p2 <= 10)
def test_ne(self):
- p1 = Price(10.0, "STEEM/SBD")
- p2 = Price(5.0, "STEEM/SBD")
+ p1 = Price(10.0, "HIVE/HBD")
+ p2 = Price(5.0, "HIVE/HBD")
self.assertTrue(p1 != p2)
self.assertTrue(p1 == p1)
@@ -125,11 +125,11 @@ class Testcases(unittest.TestCase):
self.assertTrue(p1 == 10)
def test_order(self):
- order = Order(Amount("2 SBD"), Amount("1 STEEM"))
+ order = Order(Amount("2 HBD"), Amount("1 HIVE"))
self.assertTrue(repr(order) is not None)
def test_filled_order(self):
- order = {"date": "1900-01-01T00:00:00", "current_pays": "2 SBD", "open_pays": "1 STEEM"}
+ order = {"date": "1900-01-01T00:00:00", "current_pays": "2 HBD", "open_pays": "1 HIVE"}
filledOrder = FilledOrder(order)
self.assertTrue(repr(filledOrder) is not None)
- self.assertEqual(filledOrder.json()["current_pays"], Amount("2.000 SBD").json())
+ self.assertEqual(filledOrder.json()["current_pays"], Amount("2.000 HBD").json())
diff --git a/tests/beem/test_steem.py b/tests/beem/test_steem.py
index 12d6faec45f7a467af132259454e1657fdeed815..779700ee05ec470479a3107272a01563381b2f34 100644
--- a/tests/beem/test_steem.py
+++ b/tests/beem/test_steem.py
@@ -19,7 +19,7 @@ from beem.wallet import Wallet
from beem.witness import Witness
from beem.account import Account
from beemgraphenebase.account import PrivateKey
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.nodelist import NodeList
# Py3 compatibility
import sys
@@ -32,7 +32,7 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
cls.nodelist = NodeList()
- cls.nodelist.update_nodes(steem_instance=Steem(node=cls.nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ cls.nodelist.update_nodes(hive_instance=Steem(node=cls.nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
node=cls.nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
@@ -40,14 +40,14 @@ class Testcases(unittest.TestCase):
data_refresh_time_seconds=900,
keys={"active": wif, "owner": wif, "memo": wif},
num_retries=10)
- cls.account = Account("test", full=True, steem_instance=cls.bts)
+ cls.account = Account("test", full=True, hive_instance=cls.bts)
def test_transfer(self):
bts = self.bts
acc = self.account
- acc.steem.txbuffer.clear()
+ acc.hive.txbuffer.clear()
tx = acc.transfer(
- "test", 1.33, "SBD", memo="Foobar", account="test1")
+ "test", 1.33, "HBD", memo="Foobar", account="test1")
self.assertEqual(
tx["operations"][0][0],
"transfer"
@@ -58,7 +58,7 @@ class Testcases(unittest.TestCase):
self.assertEqual(op["memo"], "Foobar")
self.assertEqual(op["from"], "test1")
self.assertEqual(op["to"], "test")
- amount = Amount(op["amount"], steem_instance=bts)
+ amount = Amount(op["amount"], hive_instance=bts)
self.assertEqual(float(amount), 1.33)
def test_create_account(self):
@@ -204,9 +204,9 @@ class Testcases(unittest.TestCase):
tx1 = bts.new_tx()
tx2 = bts.new_tx()
- acc.transfer("test1", 1, "STEEM", append_to=tx1)
- acc.transfer("test1", 2, "STEEM", append_to=tx2)
- acc.transfer("test1", 3, "STEEM", append_to=tx1)
+ acc.transfer("test1", 1, "HIVE", append_to=tx1)
+ acc.transfer("test1", 2, "HIVE", append_to=tx2)
+ acc.transfer("test1", 3, "HIVE", append_to=tx1)
tx1 = tx1.json()
tx2 = tx2.json()
ops1 = tx1["operations"]
@@ -288,8 +288,8 @@ class Testcases(unittest.TestCase):
acc = self.account
prefix = "STM"
pkey = 'STM55VCzsb47NZwWe5F3qyQKedX9iHBHMVVFSc96PDvV7wuj7W86n'
- self.assertEqual(acc.steem.prefix, prefix)
- acc.steem.txbuffer.clear()
+ self.assertEqual(acc.hive.prefix, prefix)
+ acc.hive.txbuffer.clear()
tx = acc.update_memo_key(pkey)
self.assertEqual(
(tx["operations"][0][0]),
@@ -302,7 +302,7 @@ class Testcases(unittest.TestCase):
def test_approvewitness(self):
w = self.account
- w.steem.txbuffer.clear()
+ w.hive.txbuffer.clear()
tx = w.approvewitness("test1")
self.assertEqual(
(tx["operations"][0][0]),
@@ -351,8 +351,8 @@ class Testcases(unittest.TestCase):
self.assertIn(
"gtg",
op["author"])
- self.assertEqual('1000000.000 SBD', op["max_accepted_payout"])
- self.assertEqual(10000, op["percent_steem_dollars"])
+ self.assertEqual('1000000.000 HBD', op["max_accepted_payout"])
+ self.assertEqual(10000, op["percent_hive_dollars"])
self.assertEqual(True, op["allow_votes"])
self.assertEqual(True, op["allow_curation_rewards"])
self.assertEqual("witness-gtg-log", op["permlink"])
@@ -400,40 +400,40 @@ class Testcases(unittest.TestCase):
self.assertTrue(bts.get_block_interval() is not None)
self.assertTrue(bts.get_blockchain_version() is not None)
- def test_sp_to_rshares(self):
+ def test_hp_to_rshares(self):
stm = self.bts
- rshares = stm.sp_to_rshares(stm.vests_to_sp(1e6))
+ rshares = stm.hp_to_rshares(stm.vests_to_hp(1e6))
self.assertTrue(abs(rshares - 20000000000.0) < 2)
def test_rshares_to_vests(self):
stm = self.bts
- rshares = stm.sp_to_rshares(stm.vests_to_sp(1e6))
+ rshares = stm.hp_to_rshares(stm.vests_to_hp(1e6))
rshares2 = stm.vests_to_rshares(1e6)
self.assertTrue(abs(rshares - rshares2) < 2)
- def test_sp_to_sbd(self):
+ def test_hp_to_hbd(self):
stm = self.bts
- sp = 500
- ret = stm.sp_to_sbd(sp)
+ hp = 500
+ ret = stm.hp_to_hbd(hp)
self.assertTrue(ret is not None)
- def test_sbd_to_rshares(self):
+ def test_hbd_to_rshares(self):
stm = self.bts
test_values = [1, 10, 100, 1e3, 1e4, 1e5, 1e6, 1e7]
for v in test_values:
try:
- sbd = round(stm.rshares_to_sbd(stm.sbd_to_rshares(v)), 5)
- except ValueError: # Reward pool smaller than 1e7 SBD (e.g. caused by a very low steem price)
+ hbd = round(stm.rshares_to_hbd(stm.hbd_to_rshares(v)), 5)
+ except ValueError: # Reward pool smaller than 1e7 HBD (e.g. caused by a very low hive price)
continue
- self.assertEqual(sbd, v)
+ self.assertEqual(hbd, v)
def test_rshares_to_vote_pct(self):
stm = self.bts
- sp = 1000
+ hp = 1000
voting_power = 9000
for vote_pct in range(500, 10000, 500):
- rshares = stm.sp_to_rshares(sp, voting_power=voting_power, vote_pct=vote_pct)
- vote_pct_ret = stm.rshares_to_vote_pct(rshares, steem_power=sp, voting_power=voting_power)
+ rshares = stm.hp_to_rshares(hp, voting_power=voting_power, vote_pct=vote_pct)
+ vote_pct_ret = stm.rshares_to_vote_pct(rshares, hive_power=hp, voting_power=voting_power)
self.assertEqual(vote_pct_ret, vote_pct)
def test_sign(self):
diff --git a/tests/beem/test_steemconnect.py b/tests/beem/test_steemconnect.py
index d70eb0568643ce35ae0157c0775bdd4ea18750a9..bdf46b0a0f53d4b0cc24a30ef0f382acad021e6b 100644
--- a/tests/beem/test_steemconnect.py
+++ b/tests/beem/test_steemconnect.py
@@ -19,9 +19,9 @@ from beem.wallet import Wallet
from beem.witness import Witness
from beem.account import Account
from beemgraphenebase.account import PrivateKey
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.nodelist import NodeList
-from beem.steemconnect import SteemConnect
+from beem.hiveconnect import SteemConnect
# Py3 compatibility
import sys
core_unit = "STM"
@@ -32,7 +32,7 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
@@ -40,17 +40,17 @@ class Testcases(unittest.TestCase):
data_refresh_time_seconds=900,
num_retries=10)
- cls.account = Account("test", full=True, steem_instance=cls.bts)
+ cls.account = Account("test", full=True, hive_instance=cls.bts)
def test_transfer(self):
bts = self.bts
acc = self.account
- acc.steem.txbuffer.clear()
+ acc.hive.txbuffer.clear()
tx = acc.transfer(
- "test1", 1.000, "STEEM", memo="test")
- sc2 = SteemConnect(steem_instance=bts)
+ "test1", 1.000, "HIVE", memo="test")
+ sc2 = SteemConnect(hive_instance=bts)
url = sc2.url_from_tx(tx)
- url_test = 'https://steemconnect.com/sign/transfer?from=test&to=test1&amount=1.000+STEEM&memo=test'
+ url_test = 'https://hiveconnect.com/sign/transfer?from=test&to=test1&amount=1.000+HIVE&memo=test'
self.assertEqual(len(url), len(url_test))
self.assertEqual(len(url.split('?')), 2)
self.assertEqual(url.split('?')[0], url_test.split('?')[0])
@@ -63,9 +63,9 @@ class Testcases(unittest.TestCase):
def test_login_url(self):
bts = self.bts
- sc2 = SteemConnect(steem_instance=bts)
+ sc2 = SteemConnect(hive_instance=bts)
url = sc2.get_login_url("localhost", scope="login,vote")
- url_test = 'https://steemconnect.com/oauth2/authorize?client_id=None&redirect_uri=localhost&scope=login,vote'
+ url_test = 'https://hiveconnect.com/oauth2/authorize?client_id=None&redirect_uri=localhost&scope=login,vote'
self.assertEqual(len(url), len(url_test))
self.assertEqual(len(url.split('?')), 2)
self.assertEqual(url.split('?')[0], url_test.split('?')[0])
diff --git a/tests/beem/test_storage.py b/tests/beem/test_storage.py
index 2c0985b214788c922da67928466d148255c63630..a06cae95e3eebca8f676f34e80aeec39735febc3 100644
--- a/tests/beem/test_storage.py
+++ b/tests/beem/test_storage.py
@@ -19,7 +19,7 @@ from beem.wallet import Wallet
from beem.witness import Witness
from beem.account import Account
from beemgraphenebase.account import PrivateKey
-from beem.instance import set_shared_steem_instance, shared_steem_instance
+from beem.instance import set_shared_hive_instance, shared_hive_instance
from beem.nodelist import NodeList
# Py3 compatibility
import sys
@@ -30,10 +30,10 @@ wif = "5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"
class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
- stm = shared_steem_instance()
+ stm = shared_hive_instance()
stm.config.refreshBackup()
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.stm = Steem(
node=nodelist.get_nodes(exclude_limited=True),
@@ -45,10 +45,10 @@ class Testcases(unittest.TestCase):
)
cls.stm.set_default_account("test")
- set_shared_steem_instance(cls.stm)
+ set_shared_hive_instance(cls.stm)
# self.stm.newWallet("TestingOneTwoThree")
- cls.wallet = Wallet(steem_instance=cls.stm)
+ cls.wallet = Wallet(hive_instance=cls.stm)
cls.wallet.wipe(True)
cls.wallet.newWallet(pwd="TestingOneTwoThree")
cls.wallet.unlock(pwd="TestingOneTwoThree")
@@ -56,7 +56,7 @@ class Testcases(unittest.TestCase):
@classmethod
def tearDownClass(cls):
- stm = shared_steem_instance()
+ stm = shared_hive_instance()
stm.config.recover_with_latest_backup()
def test_set_default_account(self):
diff --git a/tests/beem/test_testnet.py b/tests/beem/test_testnet.py
index c4fdd32b459e4734e8d862228173fd7527731313..e23a4143494cbd9cad25aa4731f59eed6cafa590 100644
--- a/tests/beem/test_testnet.py
+++ b/tests/beem/test_testnet.py
@@ -20,7 +20,7 @@ from beemapi import exceptions
from beem.amount import Amount
from beem.witness import Witness
from beem.account import Account
-from beem.instance import set_shared_steem_instance, shared_steem_instance
+from beem.instance import set_shared_hive_instance, shared_hive_instance
from beem.blockchain import Blockchain
from beem.block import Block
from beem.memo import Memo
@@ -41,7 +41,7 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- # stm = shared_steem_instance()
+ # stm = shared_hive_instance()
# stm.config.refreshBackup()
# nodes = nodelist.get_testnet()
cls.nodes = nodelist.get_nodes()
@@ -90,7 +90,7 @@ class Testcases(unittest.TestCase):
@classmethod
def tearDownClass(cls):
- stm = shared_steem_instance()
+ stm = shared_hive_instance()
stm.config.recover_with_latest_backup()
def test_wallet_keys(self):
@@ -119,9 +119,9 @@ class Testcases(unittest.TestCase):
bts.wallet.unlock("123")
# bts.wallet.addPrivateKey(self.active_key)
# bts.prefix ="STX"
- acc = Account("beem", steem_instance=bts)
+ acc = Account("beem", hive_instance=bts)
tx = acc.transfer(
- "beem1", 1.33, "SBD", memo="Foobar")
+ "beem1", 1.33, "HBD", memo="Foobar")
self.assertEqual(
tx["operations"][0][0],
"transfer"
@@ -131,7 +131,7 @@ class Testcases(unittest.TestCase):
self.assertIn("memo", op)
self.assertEqual(op["from"], "beem")
self.assertEqual(op["to"], "beem1")
- amount = Amount(op["amount"], steem_instance=bts)
+ amount = Amount(op["amount"], hive_instance=bts)
self.assertEqual(float(amount), 1.33)
bts.nobroadcast = True
@@ -139,9 +139,9 @@ class Testcases(unittest.TestCase):
bts = self.bts
bts.nobroadcast = False
bts.wallet.unlock("123")
- acc = Account("beem", steem_instance=bts)
+ acc = Account("beem", hive_instance=bts)
tx = acc.transfer(
- "beem1", 1.33, "SBD", memo="#Foobar")
+ "beem1", 1.33, "HBD", memo="#Foobar")
self.assertEqual(
tx["operations"][0][0],
"transfer"
@@ -149,23 +149,23 @@ class Testcases(unittest.TestCase):
op = tx["operations"][0][1]
self.assertIn("memo", op)
self.assertIn("#", op["memo"])
- m = Memo(from_account=op["from"], to_account=op["to"], steem_instance=bts)
+ m = Memo(from_account=op["from"], to_account=op["to"], hive_instance=bts)
memo = m.decrypt(op["memo"])
self.assertEqual(memo, "Foobar")
self.assertEqual(op["from"], "beem")
self.assertEqual(op["to"], "beem1")
- amount = Amount(op["amount"], steem_instance=bts)
+ amount = Amount(op["amount"], hive_instance=bts)
self.assertEqual(float(amount), 1.33)
bts.nobroadcast = True
def test_transfer_1of1(self):
- steem = self.bts
- steem.nobroadcast = False
- tx = TransactionBuilder(use_condenser_api=True, steem_instance=steem)
+ hive = self.bts
+ hive.nobroadcast = False
+ tx = TransactionBuilder(use_condenser_api=True, hive_instance=hive)
tx.appendOps(Transfer(**{"from": 'beem',
"to": 'beem1',
- "amount": Amount("0.01 STEEM", steem_instance=steem),
+ "amount": Amount("0.01 HIVE", hive_instance=hive),
"memo": '1 of 1 transaction'}))
self.assertEqual(
tx["operations"][0]["type"],
@@ -176,16 +176,16 @@ class Testcases(unittest.TestCase):
tx.sign()
self.assertEqual(len(tx['signatures']), 1)
tx.broadcast()
- steem.nobroadcast = True
+ hive.nobroadcast = True
def test_transfer_2of2_simple(self):
# Send a 2 of 2 transaction from elf which needs beem4's cosign to send funds
- steem = self.bts
- steem.nobroadcast = False
- tx = TransactionBuilder(use_condenser_api=True, steem_instance=steem)
+ hive = self.bts
+ hive.nobroadcast = False
+ tx = TransactionBuilder(use_condenser_api=True, hive_instance=hive)
tx.appendOps(Transfer(**{"from": 'beem5',
"to": 'beem1',
- "amount": Amount("0.01 STEEM", steem_instance=steem),
+ "amount": Amount("0.01 HIVE", hive_instance=hive),
"memo": '2 of 2 simple transaction'}))
tx.appendWif(self.active_private_key_of_beem5)
@@ -195,43 +195,43 @@ class Testcases(unittest.TestCase):
tx.sign(reconstruct_tx=False)
self.assertEqual(len(tx['signatures']), 2)
tx.broadcast()
- steem.nobroadcast = True
+ hive.nobroadcast = True
def test_transfer_2of2_wallet(self):
# Send a 2 of 2 transaction from beem5 which needs beem4's cosign to send
# priv key of beem5 and beem4 are stored in the wallet
# appendSigner fetches both keys and signs automatically with both keys.
- steem = self.bts
- steem.nobroadcast = False
- steem.wallet.unlock("123")
+ hive = self.bts
+ hive.nobroadcast = False
+ hive.wallet.unlock("123")
- tx = TransactionBuilder(use_condenser_api=True, steem_instance=steem)
+ tx = TransactionBuilder(use_condenser_api=True, hive_instance=hive)
tx.appendOps(Transfer(**{"from": 'beem5',
"to": 'beem1',
- "amount": Amount("0.01 STEEM", steem_instance=steem),
+ "amount": Amount("0.01 HIVE", hive_instance=hive),
"memo": '2 of 2 serialized/deserialized transaction'}))
tx.appendSigner("beem5", "active")
tx.sign()
self.assertEqual(len(tx['signatures']), 2)
tx.broadcast()
- steem.nobroadcast = True
+ hive.nobroadcast = True
def test_transfer_2of2_serialized_deserialized(self):
# Send a 2 of 2 transaction from beem5 which needs beem4's cosign to send
# funds but sign the transaction with beem5's key and then serialize the transaction
# and deserialize the transaction. After that, sign with beem4's key.
- steem = self.bts
- steem.nobroadcast = False
- steem.wallet.unlock("123")
- # steem.wallet.removeAccount("beem4")
- steem.wallet.removePrivateKeyFromPublicKey(str(PublicKey(self.active_private_key_of_beem4, prefix=core_unit)))
+ hive = self.bts
+ hive.nobroadcast = False
+ hive.wallet.unlock("123")
+ # hive.wallet.removeAccount("beem4")
+ hive.wallet.removePrivateKeyFromPublicKey(str(PublicKey(self.active_private_key_of_beem4, prefix=core_unit)))
- tx = TransactionBuilder(use_condenser_api=True, steem_instance=steem)
+ tx = TransactionBuilder(use_condenser_api=True, hive_instance=hive)
tx.appendOps(Transfer(**{"from": 'beem5',
"to": 'beem1',
- "amount": Amount("0.01 STEEM", steem_instance=steem),
+ "amount": Amount("0.01 HIVE", hive_instance=hive),
"memo": '2 of 2 serialized/deserialized transaction'}))
tx.appendSigner("beem5", "active")
@@ -239,33 +239,33 @@ class Testcases(unittest.TestCase):
tx.sign()
tx.clearWifs()
self.assertEqual(len(tx['signatures']), 1)
- # steem.wallet.removeAccount("beem5")
- steem.wallet.removePrivateKeyFromPublicKey(str(PublicKey(self.active_private_key_of_beem5, prefix=core_unit)))
+ # hive.wallet.removeAccount("beem5")
+ hive.wallet.removePrivateKeyFromPublicKey(str(PublicKey(self.active_private_key_of_beem5, prefix=core_unit)))
tx_json = tx.json()
del tx
- new_tx = TransactionBuilder(tx=tx_json, steem_instance=steem)
+ new_tx = TransactionBuilder(tx=tx_json, hive_instance=hive)
self.assertEqual(len(new_tx['signatures']), 1)
- steem.wallet.addPrivateKey(self.active_private_key_of_beem4)
+ hive.wallet.addPrivateKey(self.active_private_key_of_beem4)
new_tx.appendMissingSignatures()
new_tx.sign(reconstruct_tx=False)
self.assertEqual(len(new_tx['signatures']), 2)
new_tx.broadcast()
- steem.nobroadcast = True
+ hive.nobroadcast = True
def test_transfer_2of2_offline(self):
# Send a 2 of 2 transaction from beem5 which needs beem4's cosign to send
# funds but sign the transaction with beem5's key and then serialize the transaction
# and deserialize the transaction. After that, sign with beem4's key.
- steem = self.bts
- steem.nobroadcast = False
- steem.wallet.unlock("123")
- # steem.wallet.removeAccount("beem4")
- steem.wallet.removePrivateKeyFromPublicKey(str(PublicKey(self.active_private_key_of_beem4, prefix=core_unit)))
+ hive = self.bts
+ hive.nobroadcast = False
+ hive.wallet.unlock("123")
+ # hive.wallet.removeAccount("beem4")
+ hive.wallet.removePrivateKeyFromPublicKey(str(PublicKey(self.active_private_key_of_beem4, prefix=core_unit)))
- tx = TransactionBuilder(use_condenser_api=True, steem_instance=steem)
+ tx = TransactionBuilder(use_condenser_api=True, hive_instance=hive)
tx.appendOps(Transfer(**{"from": 'beem5',
"to": 'beem',
- "amount": Amount("0.01 STEEM", steem_instance=steem),
+ "amount": Amount("0.01 HIVE", hive_instance=hive),
"memo": '2 of 2 serialized/deserialized transaction'}))
tx.appendSigner("beem5", "active")
@@ -273,15 +273,15 @@ class Testcases(unittest.TestCase):
tx.sign()
tx.clearWifs()
self.assertEqual(len(tx['signatures']), 1)
- # steem.wallet.removeAccount("beem5")
- steem.wallet.removePrivateKeyFromPublicKey(str(PublicKey(self.active_private_key_of_beem5, prefix=core_unit)))
- steem.wallet.addPrivateKey(self.active_private_key_of_beem4)
+ # hive.wallet.removeAccount("beem5")
+ hive.wallet.removePrivateKeyFromPublicKey(str(PublicKey(self.active_private_key_of_beem5, prefix=core_unit)))
+ hive.wallet.addPrivateKey(self.active_private_key_of_beem4)
tx.appendMissingSignatures()
tx.sign(reconstruct_tx=False)
self.assertEqual(len(tx['signatures']), 2)
tx.broadcast()
- steem.nobroadcast = True
- steem.wallet.addPrivateKey(self.active_private_key_of_beem5)
+ hive.nobroadcast = True
+ hive.wallet.addPrivateKey(self.active_private_key_of_beem5)
def test_transfer_2of2_wif(self):
@@ -289,17 +289,17 @@ class Testcases(unittest.TestCase):
# Send a 2 of 2 transaction from elf which needs beem4's cosign to send
# funds but sign the transaction with elf's key and then serialize the transaction
# and deserialize the transaction. After that, sign with beem4's key.
- steem = Steem(
+ hive = Steem(
node=self.nodes,
num_retries=10,
keys=[self.active_private_key_of_beem5],
expiration=360,
)
- tx = TransactionBuilder(use_condenser_api=True, steem_instance=steem)
+ tx = TransactionBuilder(use_condenser_api=True, hive_instance=hive)
tx.appendOps(Transfer(**{"from": 'beem5',
"to": 'beem',
- "amount": Amount("0.01 STEEM", steem_instance=steem),
+ "amount": Amount("0.01 HIVE", hive_instance=hive),
"memo": '2 of 2 serialized/deserialized transaction'}))
tx.appendSigner("beem5", "active")
@@ -308,16 +308,16 @@ class Testcases(unittest.TestCase):
tx.clearWifs()
self.assertEqual(len(tx['signatures']), 1)
tx_json = tx.json()
- del steem
+ del hive
del tx
- steem = Steem(
+ hive = Steem(
node=self.nodes,
num_retries=10,
keys=[self.active_private_key_of_beem4],
expiration=360,
)
- new_tx = TransactionBuilder(tx=tx_json, steem_instance=steem)
+ new_tx = TransactionBuilder(tx=tx_json, hive_instance=hive)
new_tx.appendMissingSignatures()
new_tx.sign(reconstruct_tx=False)
self.assertEqual(len(new_tx['signatures']), 2)
@@ -326,12 +326,12 @@ class Testcases(unittest.TestCase):
def test_verifyAuthority(self):
stm = self.bts
stm.wallet.unlock("123")
- tx = TransactionBuilder(use_condenser_api=True, steem_instance=stm)
+ tx = TransactionBuilder(use_condenser_api=True, hive_instance=stm)
tx.appendOps(Transfer(**{"from": "beem",
"to": "beem1",
- "amount": Amount("1.300 SBD", steem_instance=stm),
+ "amount": Amount("1.300 HBD", hive_instance=stm),
"memo": "Foobar"}))
- account = Account("beem", steem_instance=stm)
+ account = Account("beem", hive_instance=stm)
tx.appendSigner(account, "active")
self.assertTrue(len(tx.wifs) > 0)
tx.sign()
@@ -414,10 +414,10 @@ class Testcases(unittest.TestCase):
tx1 = bts.new_tx()
tx2 = bts.new_tx()
- acc = Account("beem", steem_instance=bts)
- acc.transfer("beem1", 1, "STEEM", append_to=tx1)
- acc.transfer("beem1", 2, "STEEM", append_to=tx2)
- acc.transfer("beem1", 3, "STEEM", append_to=tx1)
+ acc = Account("beem", hive_instance=bts)
+ acc.transfer("beem1", 1, "HIVE", append_to=tx1)
+ acc.transfer("beem1", 2, "HIVE", append_to=tx2)
+ acc.transfer("beem1", 3, "HIVE", append_to=tx1)
tx1 = tx1.json()
tx2 = tx2.json()
ops1 = tx1["operations"]
@@ -447,8 +447,8 @@ class Testcases(unittest.TestCase):
def test_allow(self):
bts = self.bts
self.assertIn(bts.prefix, "STX")
- acc = Account("beem", steem_instance=bts)
- self.assertIn(acc.steem.prefix, "STX")
+ acc = Account("beem", hive_instance=bts)
+ self.assertIn(acc.hive.prefix, "STX")
tx = acc.allow(
"STX55VCzsb47NZwWe5F3qyQKedX9iHBHMVVFSc96PDvV7wuj7W86n",
account="beem",
@@ -469,7 +469,7 @@ class Testcases(unittest.TestCase):
def test_disallow(self):
bts = self.bts
- acc = Account("beem", steem_instance=bts)
+ acc = Account("beem", hive_instance=bts)
if sys.version > '3':
_assertRaisesRegex = self.assertRaisesRegex
else:
@@ -493,7 +493,7 @@ class Testcases(unittest.TestCase):
bts = self.bts
bts.wallet.unlock("123")
self.assertEqual(bts.prefix, "STX")
- acc = Account("beem", steem_instance=bts)
+ acc = Account("beem", hive_instance=bts)
tx = acc.update_memo_key("STX55VCzsb47NZwWe5F3qyQKedX9iHBHMVVFSc96PDvV7wuj7W86n")
self.assertEqual(
(tx["operations"][0][0]),
@@ -506,7 +506,7 @@ class Testcases(unittest.TestCase):
def test_approvewitness(self):
bts = self.bts
- w = Account("beem", steem_instance=bts)
+ w = Account("beem", hive_instance=bts)
tx = w.approvewitness("beem1")
self.assertEqual(
(tx["operations"][0][0]),
@@ -523,10 +523,10 @@ class Testcases(unittest.TestCase):
nobroadcast=True,
expiration=120,
num_retries=10)
- tx = TransactionBuilder(use_condenser_api=True, steem_instance=stm)
+ tx = TransactionBuilder(use_condenser_api=True, hive_instance=stm)
tx.appendOps(Transfer(**{"from": "beem",
"to": "beem1",
- "amount": Amount("1 STEEM", steem_instance=stm),
+ "amount": Amount("1 HIVE", hive_instance=stm),
"memo": ""}))
with self.assertRaises(
MissingKeyError
@@ -547,12 +547,12 @@ class Testcases(unittest.TestCase):
nobroadcast=True,
expiration=120,
num_retries=10)
- tx = TransactionBuilder(use_condenser_api=True, steem_instance=stm)
+ tx = TransactionBuilder(use_condenser_api=True, hive_instance=stm)
tx.appendOps(Transfer(**{"from": "beem",
"to": "beem1",
- "amount": Amount("1 STEEM", steem_instance=stm),
+ "amount": Amount("1 HIVE", hive_instance=stm),
"memo": ""}))
- account = Account("beem", steem_instance=stm)
+ account = Account("beem", hive_instance=stm)
with self.assertRaises(
AssertionError
):
@@ -569,12 +569,12 @@ class Testcases(unittest.TestCase):
nobroadcast=True,
expiration=120,
num_retries=10)
- tx = TransactionBuilder(use_condenser_api=True, steem_instance=stm)
+ tx = TransactionBuilder(use_condenser_api=True, hive_instance=stm)
tx.appendOps(Transfer(**{"from": "beem",
"to": "beem1",
- "amount": Amount("1 STEEM", steem_instance=stm),
+ "amount": Amount("1 HIVE", hive_instance=stm),
"memo": ""}))
- account = Account("beem2", steem_instance=stm)
+ account = Account("beem2", hive_instance=stm)
tx.appendSigner(account, "active")
tx.appendWif(self.posting_key)
self.assertTrue(len(tx.wifs) > 0)
@@ -593,10 +593,10 @@ class Testcases(unittest.TestCase):
expiration=120,
num_retries=10)
- tx = TransactionBuilder(use_condenser_api=True, expiration=10, steem_instance=stm)
+ tx = TransactionBuilder(use_condenser_api=True, expiration=10, hive_instance=stm)
tx.appendOps(Transfer(**{"from": "beem",
"to": "beem1",
- "amount": Amount("1 STEEM", steem_instance=stm),
+ "amount": Amount("1 HIVE", hive_instance=stm),
"memo": ""}))
tx.appendSigner("beem", "active")
tx.sign()
@@ -606,16 +606,16 @@ class Testcases(unittest.TestCase):
stm = self.bts
opTransfer = Transfer(**{"from": "beem",
"to": "beem1",
- "amount": Amount("1 STEEM", steem_instance=stm),
+ "amount": Amount("1 HIVE", hive_instance=stm),
"memo": ""})
- tx1 = TransactionBuilder(use_condenser_api=True, steem_instance=stm)
+ tx1 = TransactionBuilder(use_condenser_api=True, hive_instance=stm)
tx1.appendOps(opTransfer)
- tx = TransactionBuilder(tx1, steem_instance=stm)
+ tx = TransactionBuilder(tx1, hive_instance=stm)
self.assertFalse(tx.is_empty())
self.assertTrue(len(tx.list_operations()) == 1)
self.assertTrue(repr(tx) is not None)
self.assertTrue(str(tx) is not None)
- account = Account("beem", steem_instance=stm)
+ account = Account("beem", hive_instance=stm)
tx.appendSigner(account, "active")
self.assertTrue(len(tx.wifs) > 0)
tx.sign()
@@ -629,7 +629,7 @@ class Testcases(unittest.TestCase):
nobroadcast=True,
expiration=120,
num_retries=10)
- account = Account("beem", steem_instance=stm)
+ account = Account("beem", hive_instance=stm)
account.follow("beem1")
def test_follow_posting_key(self):
@@ -639,5 +639,5 @@ class Testcases(unittest.TestCase):
nobroadcast=True,
expiration=120,
num_retries=10)
- account = Account("beem", steem_instance=stm)
+ account = Account("beem", hive_instance=stm)
account.follow("beem1")
diff --git a/tests/beem/test_txbuffers.py b/tests/beem/test_txbuffers.py
index c977e6de5f1b889241c7d9e28cf7d945aa3b80a4..0afb0612714b0d93482f29ff870097dd7186ad9f 100644
--- a/tests/beem/test_txbuffers.py
+++ b/tests/beem/test_txbuffers.py
@@ -6,7 +6,7 @@ from builtins import super
import unittest
from parameterized import parameterized
from beem import Steem
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.transactionbuilder import TransactionBuilder
from beembase.signedtransactions import Signed_Transaction
from beembase.operations import Transfer
@@ -32,7 +32,7 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_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,
@@ -40,24 +40,24 @@ class Testcases(unittest.TestCase):
nobroadcast=True,
num_retries=10
)
- cls.steemit = Steem(
- node="https://api.steemit.com",
+ cls.hiveit = Steem(
+ node="https://api.hiveit.com",
nobroadcast=True,
keys={"active": wif, "owner": wif, "memo": wif},
num_retries=10
)
- set_shared_steem_instance(cls.stm)
+ set_shared_hive_instance(cls.stm)
cls.stm.set_default_account("test")
def test_emptyTransaction(self):
stm = self.stm
- tx = TransactionBuilder(steem_instance=stm)
+ tx = TransactionBuilder(hive_instance=stm)
self.assertTrue(tx.is_empty())
self.assertTrue(tx["ref_block_num"] is not None)
def test_verify_transaction(self):
stm = self.stm
- block = Block(22005665, steem_instance=stm)
+ block = Block(22005665, hive_instance=stm)
trx = block.transactions[28]
signed_tx = Signed_Transaction(trx)
key = signed_tx.verify(chain=stm.chain_params, recover_parameter=False)
diff --git a/tests/beem/test_utils.py b/tests/beem/test_utils.py
index 00dd82122ac69921796c747d9716d91752ab3204..78dd296f71634e2fe0e0b40903796a3f914a8cf7 100644
--- a/tests/beem/test_utils.py
+++ b/tests/beem/test_utils.py
@@ -45,7 +45,7 @@ class Testcases(unittest.TestCase):
def test_authorperm_resolve(self):
self.assertEqual(resolve_authorperm('https://d.tube/#!/v/pottlund/m5cqkd1a'),
('pottlund', 'm5cqkd1a'))
- self.assertEqual(resolve_authorperm("https://steemit.com/witness-category/@gtg/24lfrm-gtg-witness-log"),
+ self.assertEqual(resolve_authorperm("https://hiveit.com/witness-category/@gtg/24lfrm-gtg-witness-log"),
('gtg', '24lfrm-gtg-witness-log'))
self.assertEqual(resolve_authorperm("@gtg/24lfrm-gtg-witness-log"),
('gtg', '24lfrm-gtg-witness-log'))
diff --git a/tests/beem/test_vote.py b/tests/beem/test_vote.py
index e013628f7b69528e87dfcd71e1a75917cd7660e8..41b2ccf8927d079f058e9e0beef68b7b5ba9c684 100644
--- a/tests/beem/test_vote.py
+++ b/tests/beem/test_vote.py
@@ -12,7 +12,7 @@ from beem import Steem, exceptions
from beem.comment import Comment
from beem.account import Account
from beem.vote import Vote, ActiveVotes, AccountVotes
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.utils import construct_authorperm, resolve_authorperm, resolve_authorpermvoter, construct_authorpermvoter
from beem.nodelist import NodeList
@@ -23,7 +23,7 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
@@ -32,10 +32,10 @@ class Testcases(unittest.TestCase):
)
# from getpass import getpass
# self.bts.wallet.unlock(getpass())
- set_shared_steem_instance(cls.bts)
+ set_shared_hive_instance(cls.bts)
cls.bts.set_default_account("test")
- acc = Account("holger80", steem_instance=cls.bts)
+ acc = Account("holger80", hive_instance=cls.bts)
n_votes = 0
index = 0
while n_votes == 0:
@@ -55,12 +55,12 @@ class Testcases(unittest.TestCase):
def test_vote(self):
bts = self.bts
- vote = Vote(self.authorpermvoter, steem_instance=bts)
+ vote = Vote(self.authorpermvoter, hive_instance=bts)
self.assertEqual(self.voter, vote["voter"])
self.assertEqual(self.author, vote["author"])
self.assertEqual(self.permlink, vote["permlink"])
- vote = Vote(self.voter, authorperm=self.authorperm, steem_instance=bts)
+ vote = Vote(self.voter, authorperm=self.authorperm, hive_instance=bts)
self.assertEqual(self.voter, vote["voter"])
self.assertEqual(self.author, vote["author"])
self.assertEqual(self.permlink, vote["permlink"])
@@ -68,7 +68,7 @@ class Testcases(unittest.TestCase):
self.assertEqual(self.voter, vote_json["voter"])
self.assertEqual(self.voter, vote.voter)
self.assertTrue(vote.weight >= 0)
- self.assertTrue(vote.sbd >= 0)
+ self.assertTrue(vote.hbd >= 0)
self.assertTrue(vote.rshares >= 0)
self.assertTrue(vote.percent >= 0)
self.assertTrue(vote.reputation is not None)
@@ -82,7 +82,7 @@ class Testcases(unittest.TestCase):
self.assertEqual(self.voter, vote_json["voter"])
self.assertEqual(self.voter, vote.voter)
self.assertTrue(vote.weight >= 0)
- self.assertTrue(vote.sbd >= 0)
+ self.assertTrue(vote.hbd >= 0)
self.assertTrue(vote.rshares >= 0)
self.assertTrue(vote.percent >= 0)
self.assertTrue(vote.reputation is not None)
@@ -94,21 +94,21 @@ class Testcases(unittest.TestCase):
with self.assertRaises(
exceptions.VoteDoesNotExistsException
):
- Vote(construct_authorpermvoter(self.author, self.permlink, "asdfsldfjlasd"), steem_instance=bts)
+ Vote(construct_authorpermvoter(self.author, self.permlink, "asdfsldfjlasd"), hive_instance=bts)
with self.assertRaises(
exceptions.VoteDoesNotExistsException
):
- Vote(construct_authorpermvoter(self.author, "sdlfjd", "asdfsldfjlasd"), steem_instance=bts)
+ Vote(construct_authorpermvoter(self.author, "sdlfjd", "asdfsldfjlasd"), hive_instance=bts)
with self.assertRaises(
exceptions.VoteDoesNotExistsException
):
- Vote(construct_authorpermvoter("sdalfj", "dsfa", "asdfsldfjlasd"), steem_instance=bts)
+ Vote(construct_authorpermvoter("sdalfj", "dsfa", "asdfsldfjlasd"), hive_instance=bts)
def test_activevotes(self):
bts = self.bts
- votes = ActiveVotes(self.authorperm, steem_instance=bts)
+ votes = ActiveVotes(self.authorperm, hive_instance=bts)
votes.printAsTable()
vote_list = votes.get_list()
self.assertTrue(isinstance(vote_list, list))
@@ -117,6 +117,6 @@ class Testcases(unittest.TestCase):
bts = self.bts
utc = pytz.timezone('UTC')
limit_time = utc.localize(datetime.utcnow()) - timedelta(days=7)
- votes = AccountVotes(self.voter, start=limit_time, steem_instance=bts)
+ votes = AccountVotes(self.voter, start=limit_time, hive_instance=bts)
self.assertTrue(len(votes) > 0)
self.assertTrue(isinstance(votes[0], Vote))
diff --git a/tests/beem/test_wallet.py b/tests/beem/test_wallet.py
index e080e440aa850aebba124b69f0f3f220a528f96f..e708c285ecdba39b543df4f148cffb12beb78074 100644
--- a/tests/beem/test_wallet.py
+++ b/tests/beem/test_wallet.py
@@ -12,7 +12,7 @@ from beem.account import Account
from beem.amount import Amount
from beem.asset import Asset
from beem.wallet import Wallet
-from beem.instance import set_shared_steem_instance, shared_steem_instance
+from beem.instance import set_shared_hive_instance, shared_hive_instance
from beem.nodelist import NodeList
wif = "5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"
@@ -21,10 +21,10 @@ wif = "5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"
class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
- stm = shared_steem_instance()
+ stm = shared_hive_instance()
stm.config.refreshBackup()
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.stm = Steem(
node=nodelist.get_nodes(exclude_limited=True),
@@ -35,10 +35,10 @@ class Testcases(unittest.TestCase):
# Overwrite wallet to use this list of wifs only
)
cls.stm.set_default_account("test")
- set_shared_steem_instance(cls.stm)
+ set_shared_hive_instance(cls.stm)
# self.stm.newWallet("TestingOneTwoThree")
- cls.wallet = Wallet(steem_instance=cls.stm)
+ cls.wallet = Wallet(hive_instance=cls.stm)
cls.wallet.wipe(True)
cls.wallet.newWallet(pwd="TestingOneTwoThree")
cls.wallet.unlock(pwd="TestingOneTwoThree")
@@ -46,12 +46,12 @@ class Testcases(unittest.TestCase):
@classmethod
def tearDownClass(cls):
- stm = shared_steem_instance()
+ stm = shared_hive_instance()
stm.config.recover_with_latest_backup()
def test_wallet_lock(self):
stm = self.stm
- self.wallet.steem = stm
+ self.wallet.hive = stm
self.wallet.unlock(pwd="TestingOneTwoThree")
self.assertTrue(self.wallet.unlocked())
self.assertFalse(self.wallet.locked())
@@ -60,7 +60,7 @@ class Testcases(unittest.TestCase):
def test_change_masterpassword(self):
stm = self.stm
- self.wallet.steem = stm
+ self.wallet.hive = stm
self.wallet.unlock(pwd="TestingOneTwoThree")
self.assertTrue(self.wallet.unlocked())
self.wallet.changePassphrase("newPass")
@@ -73,7 +73,7 @@ class Testcases(unittest.TestCase):
def test_Keys(self):
stm = self.stm
- self.wallet.steem = stm
+ self.wallet.hive = stm
self.wallet.unlock(pwd="TestingOneTwoThree")
keys = self.wallet.getPublicKeys()
self.assertTrue(len(keys) > 0)
@@ -83,7 +83,7 @@ class Testcases(unittest.TestCase):
def test_account_by_pub(self):
stm = self.stm
- self.wallet.steem = stm
+ self.wallet.hive = stm
self.wallet.unlock(pwd="TestingOneTwoThree")
acc = Account("gtg")
pub = acc["owner"]["key_auths"][0][0]
@@ -103,7 +103,7 @@ class Testcases(unittest.TestCase):
def test_pub_lookup(self):
stm = self.stm
- self.wallet.steem = stm
+ self.wallet.hive = stm
self.wallet.unlock(pwd="TestingOneTwoThree")
with self.assertRaises(
exceptions.MissingKeyError
@@ -124,7 +124,7 @@ class Testcases(unittest.TestCase):
def test_pub_lookup_keys(self):
stm = self.stm
- self.wallet.steem = stm
+ self.wallet.hive = stm
self.wallet.unlock(pwd="TestingOneTwoThree")
with self.assertRaises(
exceptions.MissingKeyError
@@ -141,7 +141,7 @@ class Testcases(unittest.TestCase):
def test_encrypt(self):
stm = self.stm
- self.wallet.steem = stm
+ self.wallet.hive = stm
self.wallet.unlock(pwd="TestingOneTwoThree")
self.wallet.masterpassword = "TestingOneTwoThree"
self.assertEqual([self.wallet.encrypt_wif("5HqUkGuo62BfcJU5vNhTXKJRXuUi9QSE6jp8C3uBJ2BVHtB8WSd"),
@@ -155,7 +155,7 @@ class Testcases(unittest.TestCase):
def test_deencrypt(self):
stm = self.stm
- self.wallet.steem = stm
+ self.wallet.hive = stm
self.wallet.unlock(pwd="TestingOneTwoThree")
self.wallet.masterpassword = "TestingOneTwoThree"
self.assertEqual([self.wallet.decrypt_wif("6PRN5mjUTtud6fUXbJXezfn6oABoSr6GSLjMbrGXRZxSUcxThxsUW8epQi"),
diff --git a/tests/beem/test_witness.py b/tests/beem/test_witness.py
index 58d71379741a2b8219f3570454a73fb2ca765a64..36f8d462b6f3019af9fc9baa3e269f295aa1f43b 100644
--- a/tests/beem/test_witness.py
+++ b/tests/beem/test_witness.py
@@ -8,7 +8,7 @@ from parameterized import parameterized
from pprint import pprint
from beem import Steem
from beem.witness import Witness, Witnesses, WitnessesVotedByAccount, WitnessesRankedByVote
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.nodelist import NodeList
wif = "5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"
@@ -18,7 +18,7 @@ class Testcases(unittest.TestCase):
@classmethod
def setUpClass(cls):
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
cls.bts = Steem(
node=nodelist.get_nodes(exclude_limited=True),
nobroadcast=True,
@@ -26,8 +26,8 @@ class Testcases(unittest.TestCase):
keys={"active": wif},
num_retries=10
)
- cls.steemit = Steem(
- node="https://api.steemit.com",
+ cls.hiveit = Steem(
+ node="https://api.hiveit.com",
nobroadcast=True,
unsigned=True,
keys={"active": wif},
@@ -35,21 +35,21 @@ class Testcases(unittest.TestCase):
)
# from getpass import getpass
# self.bts.wallet.unlock(getpass())
- set_shared_steem_instance(cls.bts)
+ set_shared_hive_instance(cls.bts)
cls.bts.set_default_account("test")
@parameterized.expand([
("normal"),
- ("steemit"),
+ ("hiveit"),
])
def test_feed_publish(self, node_param):
if node_param == "normal":
bts = self.bts
else:
- bts = self.steemit
+ bts = self.hiveit
bts.txbuffer.clear()
- w = Witness("gtg", steem_instance=bts)
- tx = w.feed_publish("4 SBD", "1 STEEM")
+ w = Witness("gtg", hive_instance=bts)
+ tx = w.feed_publish("4 HBD", "1 HIVE")
self.assertEqual(
(tx["operations"][0][0]),
"feed_publish"
@@ -61,18 +61,18 @@ class Testcases(unittest.TestCase):
@parameterized.expand([
("normal"),
- ("steemit"),
+ ("hiveit"),
])
def test_update(self, node_param):
if node_param == "normal":
bts = self.bts
else:
- bts = self.steemit
+ bts = self.hiveit
bts.txbuffer.clear()
- w = Witness("gtg", steem_instance=bts)
- props = {"account_creation_fee": "0.1 STEEM",
+ w = Witness("gtg", hive_instance=bts)
+ props = {"account_creation_fee": "0.1 HIVE",
"maximum_block_size": 32000,
- "sbd_interest_rate": 0}
+ "hbd_interest_rate": 0}
tx = w.update(wif, "", props)
self.assertEqual((tx["operations"][0][0]), "witness_update")
op = tx["operations"][0][1]
@@ -82,55 +82,55 @@ class Testcases(unittest.TestCase):
@parameterized.expand([
("normal"),
- ("steemit"),
+ ("hiveit"),
])
def test_witnesses(self, node_param):
if node_param == "normal":
bts = self.bts
else:
- bts = self.steemit
- w = Witnesses(steem_instance=bts)
+ bts = self.hiveit
+ w = Witnesses(hive_instance=bts)
w.printAsTable()
self.assertTrue(len(w) > 0)
self.assertTrue(isinstance(w[0], Witness))
@parameterized.expand([
("normal"),
- ("steemit"),
+ ("hiveit"),
])
def test_WitnessesVotedByAccount(self, node_param):
if node_param == "normal":
bts = self.bts
else:
- bts = self.steemit
- w = WitnessesVotedByAccount("gtg", steem_instance=bts)
+ bts = self.hiveit
+ w = WitnessesVotedByAccount("gtg", hive_instance=bts)
w.printAsTable()
self.assertTrue(len(w) > 0)
self.assertTrue(isinstance(w[0], Witness))
@parameterized.expand([
("normal"),
- ("steemit"),
+ ("hiveit"),
])
def test_WitnessesRankedByVote(self, node_param):
if node_param == "normal":
bts = self.bts
else:
- bts = self.steemit
- w = WitnessesRankedByVote(steem_instance=bts)
+ bts = self.hiveit
+ w = WitnessesRankedByVote(hive_instance=bts)
w.printAsTable()
self.assertTrue(len(w) > 0)
self.assertTrue(isinstance(w[0], Witness))
@parameterized.expand([
("normal"),
- ("steemit"),
+ ("hiveit"),
])
def test_export(self, node_param):
if node_param == "normal":
bts = self.bts
else:
- bts = self.steemit
+ bts = self.hiveit
owner = "gtg"
if bts.rpc.get_use_appbase():
witness = bts.rpc.find_witnesses({'owners': [owner]}, api="database")['witnesses']
@@ -139,7 +139,7 @@ class Testcases(unittest.TestCase):
else:
witness = bts.rpc.get_witness_by_account(owner)
- w = Witness(owner, steem_instance=bts)
+ w = Witness(owner, hive_instance=bts)
keys = list(witness.keys())
json_witness = w.json()
exclude_list = ['votes', 'virtual_last_update', 'virtual_scheduled_time']
diff --git a/tests/beemapi/test_rpcutils.py b/tests/beemapi/test_rpcutils.py
index 2dd3958cd6612c32c7bc5dde06dd20eeffd3c493..7a2f007179b25dc057f929ec919a3db25cffce8d 100644
--- a/tests/beemapi/test_rpcutils.py
+++ b/tests/beemapi/test_rpcutils.py
@@ -14,10 +14,10 @@ from beemapi.rpcutils import (
class Testcases(unittest.TestCase):
def test_is_network_appbase_ready(self):
- self.assertTrue(is_network_appbase_ready({'STEEM_BLOCKCHAIN_VERSION': '0.19.10'}))
- self.assertTrue(is_network_appbase_ready({'STEEM_BLOCKCHAIN_VERSION': '0.19.10'}))
- self.assertFalse(is_network_appbase_ready({'STEEMIT_BLOCKCHAIN_VERSION': '0.19.2'}))
- self.assertFalse(is_network_appbase_ready({'STEEMIT_BLOCKCHAIN_VERSION': '0.19.2'}))
+ self.assertTrue(is_network_appbase_ready({'HIVE_BLOCKCHAIN_VERSION': '0.19.10'}))
+ self.assertTrue(is_network_appbase_ready({'HIVE_BLOCKCHAIN_VERSION': '0.19.10'}))
+ self.assertFalse(is_network_appbase_ready({'HIVEIT_BLOCKCHAIN_VERSION': '0.19.2'}))
+ self.assertFalse(is_network_appbase_ready({'HIVEIT_BLOCKCHAIN_VERSION': '0.19.2'}))
def test_get_api_name(self):
self.assertEqual(get_api_name(True, api="test"), "test_api")
diff --git a/tests/beemapi/test_steemnoderpc.py b/tests/beemapi/test_steemnoderpc.py
index 89de629f7ec0658cc8f9a7d7a0a6729619c1901c..588d13f98b281cf052605a7335f3e50d23d46c4a 100644
--- a/tests/beemapi/test_steemnoderpc.py
+++ b/tests/beemapi/test_steemnoderpc.py
@@ -13,11 +13,11 @@ import random
import itertools
from pprint import pprint
from beem import Steem
-from beemapi.steemnoderpc import SteemNodeRPC
+from beemapi.hivenoderpc import SteemNodeRPC
from beemapi.websocket import SteemWebsocket
from beemapi import exceptions
from beemapi.exceptions import NumRetriesReached, CallRetriesReached
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.nodelist import NodeList
# Py3 compatibility
import sys
@@ -31,11 +31,11 @@ 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=3))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=3))
cls.nodes = nodelist.get_nodes()
- if "https://api.steemit.com" in cls.nodes:
- cls.nodes.remove("https://api.steemit.com")
- cls.nodes_steemit = ["https://api.steemit.com"]
+ if "https://api.hiveit.com" in cls.nodes:
+ cls.nodes.remove("https://api.hiveit.com")
+ cls.nodes_hiveit = ["https://api.hiveit.com"]
cls.appbase = Steem(
node=cls.nodes,
@@ -43,10 +43,10 @@ class Testcases(unittest.TestCase):
keys={"active": wif, "owner": wif, "memo": wif},
num_retries=10
)
- cls.rpc = SteemNodeRPC(urls=cls.nodes_steemit)
+ cls.rpc = SteemNodeRPC(urls=cls.nodes_hiveit)
# from getpass import getpass
# self.bts.wallet.unlock(getpass())
- set_shared_steem_instance(cls.nodes_steemit)
+ set_shared_hive_instance(cls.nodes_hiveit)
cls.appbase.set_default_account("test")
def get_reply(self, msg):
@@ -70,16 +70,16 @@ class Testcases(unittest.TestCase):
def test_connect_test_node(self):
rpc = self.rpc
- self.assertIn(rpc.url, self.nodes + self.nodes_steemit)
+ self.assertIn(rpc.url, self.nodes + self.nodes_hiveit)
rpc.rpcclose()
rpc.rpcconnect()
- self.assertIn(rpc.url, self.nodes + self.nodes_steemit)
+ self.assertIn(rpc.url, self.nodes + self.nodes_hiveit)
def test_connect_test_node2(self):
rpc = self.rpc
- self.assertIn(rpc.url, self.nodes + self.nodes_steemit)
+ self.assertIn(rpc.url, self.nodes + self.nodes_hiveit)
rpc.next()
- self.assertIn(rpc.url, self.nodes + self.nodes_steemit)
+ self.assertIn(rpc.url, self.nodes + self.nodes_hiveit)
def test_connect_test_str_list(self):
str_list = ""
@@ -87,9 +87,9 @@ class Testcases(unittest.TestCase):
str_list += node + ";"
str_list = str_list[:-1]
rpc = SteemNodeRPC(urls=str_list)
- self.assertIn(rpc.url, self.nodes + self.nodes_steemit)
+ self.assertIn(rpc.url, self.nodes + self.nodes_hiveit)
rpc.next()
- self.assertIn(rpc.url, self.nodes + self.nodes_steemit)
+ self.assertIn(rpc.url, self.nodes + self.nodes_hiveit)
def test_connect_test_str_list2(self):
str_list = ""
@@ -97,9 +97,9 @@ class Testcases(unittest.TestCase):
str_list += node + ","
str_list = str_list[:-1]
rpc = SteemNodeRPC(urls=str_list)
- self.assertIn(rpc.url, self.nodes + self.nodes_steemit)
+ self.assertIn(rpc.url, self.nodes + self.nodes_hiveit)
rpc.next()
- self.assertIn(rpc.url, self.nodes + self.nodes_steemit)
+ self.assertIn(rpc.url, self.nodes + self.nodes_hiveit)
def test_server_error(self):
rpc = self.rpc
@@ -178,7 +178,7 @@ class Testcases(unittest.TestCase):
SteemNodeRPC(urls=nodes, num_retries=0, num_retries_call=0, timeout=1)
def test_error_handling(self):
- rpc = SteemNodeRPC(urls=self.nodes_steemit, num_retries=2, num_retries_call=3)
+ rpc = SteemNodeRPC(urls=self.nodes_hiveit, num_retries=2, num_retries_call=3)
with self.assertRaises(
exceptions.NoMethodWithName
):
@@ -189,7 +189,7 @@ class Testcases(unittest.TestCase):
rpc.get_accounts("test")
def test_error_handling_appbase(self):
- rpc = SteemNodeRPC(urls=self.nodes_steemit, num_retries=2, num_retries_call=3)
+ rpc = SteemNodeRPC(urls=self.nodes_hiveit, num_retries=2, num_retries_call=3)
with self.assertRaises(
exceptions.NoMethodWithName
):
diff --git a/tests/beemapi/test_websocket.py b/tests/beemapi/test_websocket.py
index a0da41054f7f2dfc285b9bbaaa39d8b8bc24ac44..057b3221163f90ba069fcd48601b5607224f59a2 100644
--- a/tests/beemapi/test_websocket.py
+++ b/tests/beemapi/test_websocket.py
@@ -12,7 +12,7 @@ import itertools
from pprint import pprint
from beem import Steem
from beemapi.websocket import SteemWebsocket
-from beem.instance import set_shared_steem_instance
+from beem.instance import set_shared_hive_instance
from beem.nodelist import NodeList
# Py3 compatibility
import sys
@@ -26,7 +26,7 @@ class Testcases(unittest.TestCase):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
nodelist = NodeList()
- nodelist.update_nodes(steem_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+ nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
stm = Steem(node=nodelist.get_nodes())
self.ws = SteemWebsocket(
diff --git a/tests/beembase/test_objects.py b/tests/beembase/test_objects.py
index 30776289da3907777b3e06a24f36430f96262560..3f9d4e86d64e563bca1047b566cc564832cb4910 100644
--- a/tests/beembase/test_objects.py
+++ b/tests/beembase/test_objects.py
@@ -20,7 +20,7 @@ from beemgraphenebase.types import (
class Testcases(unittest.TestCase):
def test_Amount(self):
- a = "1.000 STEEM"
+ a = "1.000 HIVE"
t = Amount(a)
self.assertEqual(a, t.__str__())
self.assertEqual(a, str(t))
diff --git a/tests/beembase/test_operations.py b/tests/beembase/test_operations.py
index 21e55b09d8f3c77ab947cc9e163fed64ad5343e6..657fe6936e1c5654041b44b1770c8750a96d9338 100644
--- a/tests/beembase/test_operations.py
+++ b/tests/beembase/test_operations.py
@@ -23,7 +23,7 @@ wif = "5J4KCbg1G3my9b9hCaQXnHSm6vrwW9xQTJS6ZciW2Kek7cCkCEk"
class Testcases(unittest.TestCase):
def test_Transfer(self):
- transferJson = {'from': 'test', 'to': 'test1', 'amount': "1.000 STEEM", 'memo': 'foobar'}
+ transferJson = {'from': 'test', 'to': 'test1', 'amount': "1.000 HIVE", 'memo': 'foobar'}
t = Transfer(transferJson)
self.assertEqual(transferJson, json.loads(str(t)))
self.assertEqual(transferJson, t.json())
@@ -41,5 +41,5 @@ class Testcases(unittest.TestCase):
self.assertEqual(o.json()[1], transferJson)
tx = {'ref_block_num': 0, 'ref_block_prefix': 0, 'expiration': '2018-04-07T09:30:53', 'operations': [o], 'extensions': [], 'signatures': []}
s = Signed_Transaction(tx)
- s.sign(wifkeys=[wif], chain="STEEMAPPBASE")
+ s.sign(wifkeys=[wif], chain="HIVEAPPBASE")
self.assertEqual(s.json()["operations"][0][1], transferJson)
diff --git a/tests/beembase/test_transactions.py b/tests/beembase/test_transactions.py
index 71d134bd1ea6d0d4d4243394d0e0324b8f148424..931679c2e3eca33730a9afaa9168b5688d5c1fcd 100644
--- a/tests/beembase/test_transactions.py
+++ b/tests/beembase/test_transactions.py
@@ -26,12 +26,12 @@ from beembase.operationids import getOperationNameForId
from beemgraphenebase.py23 import py23_bytes, bytes_types
from beem.amount import Amount
from beem.asset import Asset
-from beem.steem import Steem
+from beem.hive import Steem
TEST_AGAINST_CLI_WALLET = False
-prefix = u"STEEM"
+prefix = u"HIVE"
default_prefix = u"STM"
wif = "5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"
ref_block_num = 34294
@@ -82,7 +82,7 @@ class Testcases(unittest.TestCase):
self.op = operations.Transfer(**{
"from": "foo",
"to": "baar",
- "amount": Amount("111.110 STEEM", steem_instance=self.stm),
+ "amount": Amount("111.110 HIVE", hive_instance=self.stm),
"memo": "Fooo",
"prefix": default_prefix
})
@@ -99,7 +99,7 @@ class Testcases(unittest.TestCase):
'creator':
'xeroc',
'fee':
- '10.000 STEEM',
+ '10.000 HIVE',
'json_metadata':
'',
'memo_key':
@@ -169,7 +169,7 @@ class Testcases(unittest.TestCase):
self.op = operations.Transfer_to_vesting(**{
"from": "foo",
"to": "baar",
- "amount": "111.110 STEEM",
+ "amount": "111.110 HIVE",
"prefix": default_prefix
})
@@ -235,7 +235,7 @@ class Testcases(unittest.TestCase):
**{
"from": "testuser",
"to": "testuser",
- "amount": "1.000 STEEM",
+ "amount": "1.000 HIVE",
"memo": "testmemo",
"prefix": default_prefix
})
@@ -252,7 +252,7 @@ class Testcases(unittest.TestCase):
"from": "testuser",
"request_id": 9001,
"to": "testser",
- "amount": "100.000 SBD",
+ "amount": "100.000 HBD",
"memo": "memohere",
"prefix": default_prefix
})
@@ -281,8 +281,8 @@ class Testcases(unittest.TestCase):
**{
"owner": "",
"orderid": 0,
- "amount_to_sell": "0.000 STEEM",
- "min_to_receive": "0.000 STEEM",
+ "amount_to_sell": "0.000 HIVE",
+ "min_to_receive": "0.000 HIVE",
"fill_or_kill": False,
"expiration": "2016-12-31T23:59:59",
"prefix": default_prefix
@@ -415,7 +415,7 @@ class Testcases(unittest.TestCase):
self.op = operations.Convert(**{
"owner": "xeroc",
"requestid": 2342343235,
- "amount": "100.000 SBD",
+ "amount": "100.000 HBD",
"prefix": default_prefix
})
@@ -597,8 +597,8 @@ class Testcases(unittest.TestCase):
**{
"publisher": "xeroc",
"exchange_rate": {
- "base": "1.000 SBD",
- "quote": "4.123 STEEM"
+ "base": "1.000 HBD",
+ "quote": "4.123 HIVE"
},
"prefix": default_prefix
})
@@ -634,12 +634,12 @@ class Testcases(unittest.TestCase):
"block_signing_key":
"STM6zLNtyFVToBsBZDsgMhgjpwysYVbsQD6YhP3kRkQhANUB4w7Qp",
"props": {
- "account_creation_fee": "10.000 STEEM",
+ "account_creation_fee": "10.000 HIVE",
"maximum_block_size": 1111111,
- "sbd_interest_rate": 1000
+ "hbd_interest_rate": 1000
},
"fee":
- "10.000 STEEM",
+ "10.000 HIVE",
"prefix": default_prefix
})
@@ -765,8 +765,8 @@ class Testcases(unittest.TestCase):
"permlink":
"piston",
"max_accepted_payout":
- "1000000.000 SBD",
- "percent_steem_dollars":
+ "1000000.000 HBD",
+ "percent_hive_dollars":
10000,
"allow_votes":
True,
@@ -808,7 +808,7 @@ class Testcases(unittest.TestCase):
def test_request_account_recovery(self):
self.op = operations.Request_account_recovery(
**{
- "recovery_account": "steem",
+ "recovery_account": "hive",
"account_to_recover": "alice",
"new_owner_authority": {
"weight_threshold": 1,
@@ -872,8 +872,8 @@ class Testcases(unittest.TestCase):
**{
"from": "alice",
"to": "bob",
- "sbd_amount": {"amount": "1000", "precision": 3, "nai": "@@000000013"},
- "steem_amount": {"amount": "0", "precision": 3, "nai": "@@000000021"},
+ "hbd_amount": {"amount": "1000", "precision": 3, "nai": "@@000000013"},
+ "hive_amount": {"amount": "0", "precision": 3, "nai": "@@000000021"},
"escrow_id": 23456789,
"agent": "charlie",
"fee": {"amount": "100", "precision": 3, "nai": "@@000000013"},
@@ -914,8 +914,8 @@ class Testcases(unittest.TestCase):
"to": "bob",
"who": "charlie",
"escrow_id": 72526562,
- "sbd_amount": {"amount": "5000", "precision": 3, "nai": "@@000000013"},
- "steem_amount": {"amount": "0", "precision": 3, "nai": "@@000000021"},
+ "hbd_amount": {"amount": "5000", "precision": 3, "nai": "@@000000013"},
+ "hive_amount": {"amount": "0", "precision": 3, "nai": "@@000000021"},
"prefix": default_prefix,
})
@@ -961,8 +961,8 @@ class Testcases(unittest.TestCase):
self.op = operations.Claim_reward_balance(
**{
"account": "alice",
- "reward_steem": {"amount": "17", "precision": 3, "nai": "@@000000021"},
- "reward_sbd": {"amount": "11", "precision": 3, "nai": "@@000000013"},
+ "reward_hive": {"amount": "17", "precision": 3, "nai": "@@000000021"},
+ "reward_hbd": {"amount": "11", "precision": 3, "nai": "@@000000013"},
"reward_vests": {"amount": "185025103", "precision": 6, "nai": "@@000000037"},
"prefix": default_prefix,
})
@@ -992,7 +992,7 @@ class Testcases(unittest.TestCase):
**{
"fee": {"amount": "3000", "precision": 3, "nai": "@@000000021"},
"delegation": {"amount": "0", "precision": 6, "nai": "@@000000037"},
- "creator": "steemit",
+ "creator": "hiveit",
"new_account_name": "alice",
"owner": {
"weight_threshold": 1,
@@ -1051,10 +1051,10 @@ class Testcases(unittest.TestCase):
},
"seller": "1.2.29",
"amount_to_sell": {"amount": 100000,
- "asset_id": "SBD"
+ "asset_id": "HBD"
},
"min_to_receive": {"amount": 10000,
- "asset_id": "SBD"
+ "asset_id": "HBD"
},
"expiration": "2016-05-18T09:22:05",
"fill_or_kill": False,
@@ -1072,11 +1072,11 @@ class Testcases(unittest.TestCase):
from_account_id = "test"
to_account_id = "test1"
amount = 1000000
- asset_id = "SBD"
+ asset_id = "HBD"
message = "abcdefgABCDEFG0123456789"
nonce = "5862723643998573708"
- fee = objects.Asset(amount=0, asset_id="SBD")
+ fee = objects.Asset(amount=0, asset_id="HBD")
amount = objects.Asset(amount=int(amount), asset_id=asset_id)
encrypted_memo = memo.encode_memo(
account.PrivateKey(wif),