Skip to content

Commit b322c4c

Browse files
vogel76vogel76
committed
Changes done in 'origin/develop' specific to v1.27.0 release
2 parents 0d92587 + 4a7df5f commit b322c4c

File tree

261 files changed

+822
-2346
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

261 files changed

+822
-2346
lines changed

‎libraries/chain/database.cpp

+13-9
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,20 @@
5656

5757
long next_hf_time()
5858
{
59-
// current "next hardfork" is HF26
59+
// current "next hardfork" is HF27
6060
long hfTime =
6161

6262
#ifdef IS_TEST_NET
63-
1643716800; // Tuesday, 1 February 2022 12:00:00
63+
1665532800; // Wednesday, October 12, 2022 0:00:00 GMT
6464
#else
65-
1665489600; // Tuesday, 11 October 2022 12:00:00 GMT
65+
1666612800; // Monday, 24 October 2022 12:00:00 GMT
6666
#endif /// IS_TEST_NET
6767

68-
const char* value = getenv("HIVE_HF26_TIME");
69-
if(value != nullptr)
68+
const char* value = getenv("HIVE_HF27_TIME");
69+
if (value)
7070
{
7171
hfTime = atol(value);
72-
ilog("HIVE_HF26_TIME has been specified through environment variable as ${v}, long value: ${l}", ("v", value)("l", hfTime));
72+
ilog("HIVE_HF27_TIME has been specified through environment variable as ${value}, long value: ${hfTime}", (value)(hfTime));
7373
}
7474

7575
return hfTime;
@@ -245,7 +245,7 @@ void database::load_state_initial_data(const open_args& args)
245245
FC_ASSERT(hardforks.last_hardfork <= HIVE_NUM_HARDFORKS, "Chain knows of more hardforks than configuration", ("hardforks.last_hardfork", hardforks.last_hardfork)("HIVE_NUM_HARDFORKS", HIVE_NUM_HARDFORKS));
246246
FC_ASSERT(_hardfork_versions.versions[hardforks.last_hardfork] <= HIVE_BLOCKCHAIN_VERSION, "Blockchain version is older than last applied hardfork");
247247
FC_ASSERT(HIVE_BLOCKCHAIN_HARDFORK_VERSION >= HIVE_BLOCKCHAIN_VERSION);
248-
FC_ASSERT(HIVE_BLOCKCHAIN_HARDFORK_VERSION == _hardfork_versions.versions[HIVE_NUM_HARDFORKS]);
248+
FC_ASSERT(HIVE_BLOCKCHAIN_HARDFORK_VERSION == _hardfork_versions.versions[HIVE_NUM_HARDFORKS], "Blockchain version mismatch", (HIVE_BLOCKCHAIN_HARDFORK_VERSION)(_hardfork_versions.versions[HIVE_NUM_HARDFORKS]));
249249
});
250250

251251
#ifdef USE_ALTERNATE_CHAIN_ID
@@ -1891,7 +1891,8 @@ void database::adjust_witness_votes( const account_object& a, const share_type&
18911891

18921892
void database::adjust_witness_vote( const witness_object& witness, share_type delta )
18931893
{
1894-
const witness_schedule_object& wso = get_witness_schedule_object();
1894+
const witness_schedule_object& wso = has_hardfork(HIVE_HARDFORK_1_27_FIX_TIMESHARE_WITNESS_SCHEDULING) ?
1895+
get_witness_schedule_object_for_irreversibility() : get_witness_schedule_object();
18951896
modify( witness, [&]( witness_object& w )
18961897
{
18971898
auto delta_pos = w.votes.value * (wso.current_virtual_time - w.virtual_last_update);
@@ -6422,10 +6423,13 @@ void database::init_hardforks()
64226423
FC_ASSERT( HIVE_HARDFORK_1_26 == 26, "Invalid hardfork configuration" );
64236424
_hardfork_versions.times[ HIVE_HARDFORK_1_26 ] = fc::time_point_sec( HIVE_HARDFORK_1_26_TIME );
64246425
_hardfork_versions.versions[ HIVE_HARDFORK_1_26 ] = HIVE_HARDFORK_1_26_VERSION;
6425-
#if defined(IS_TEST_NET) && defined(HIVE_ENABLE_SMT)
64266426
FC_ASSERT( HIVE_HARDFORK_1_27 == 27, "Invalid hardfork configuration" );
64276427
_hardfork_versions.times[ HIVE_HARDFORK_1_27 ] = fc::time_point_sec( HIVE_HARDFORK_1_27_TIME );
64286428
_hardfork_versions.versions[ HIVE_HARDFORK_1_27 ] = HIVE_HARDFORK_1_27_VERSION;
6429+
#if defined(IS_TEST_NET) && defined(HIVE_ENABLE_SMT)
6430+
FC_ASSERT( HIVE_HARDFORK_1_28 == 28, "Invalid hardfork configuration" );
6431+
_hardfork_versions.times[ HIVE_HARDFORK_1_28 ] = fc::time_point_sec( HIVE_HARDFORK_1_28_TIME );
6432+
_hardfork_versions.versions[ HIVE_HARDFORK_1_28 ] = HIVE_HARDFORK_1_28_VERSION;
64296433
#endif
64306434
}
64316435

‎libraries/chain/witness_schedule.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ using hive::chain::util::rd_system_params;
1414
using hive::chain::util::rd_user_params;
1515
using hive::chain::util::rd_validate_user_params;
1616

17-
// this is only called on application of hf4, and the future witness schedule doesn't take
18-
// effect until a much later hard fork, so we only need to operate on the current witness schedule here.
1917
void reset_virtual_schedule_time( database& db )
2018
{ try {
21-
const witness_schedule_object& wso = db.get_witness_schedule_object();
19+
const witness_schedule_object& wso = db.has_hardfork(HIVE_HARDFORK_1_27_FIX_TIMESHARE_WITNESS_SCHEDULING) ?
20+
db.get_witness_schedule_object_for_irreversibility() : db.get_witness_schedule_object();
2221
db.modify( wso, [&](witness_schedule_object& o )
2322
{
2423
o.current_virtual_time = fc::uint128(); // reset it 0

‎libraries/protocol/hardfork.d/0-preamble.hf

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <set>
1414

1515
#if defined(IS_TEST_NET) && defined(HIVE_ENABLE_SMT)
16-
#define HIVE_NUM_HARDFORKS 27
16+
#define HIVE_NUM_HARDFORKS 28
1717
#else
18-
#define HIVE_NUM_HARDFORKS 26
18+
#define HIVE_NUM_HARDFORKS 27
1919
#endif

‎libraries/protocol/hardfork.d/1_26.hf

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
#ifndef HIVE_HARDFORK_1_26
22
#define HIVE_HARDFORK_1_26 26
33

4-
long next_hf_time();
5-
6-
#define HIVE_HARDFORK_1_26_TIME next_hf_time()
4+
# define HIVE_HARDFORK_1_26_TIME 1665489600 // Tuesday, 11 October 2022 12:00:00 GMT
75

86
#define HIVE_HARDFORK_1_26_VERSION hive::protocol::hardfork_version( 1, 26 )
97

‎libraries/protocol/hardfork.d/1_27.hf

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
#ifndef HIVE_HARDFORK_1_27
22
#define HIVE_HARDFORK_1_27 27
3-
#define HIVE_SMT_HARDFORK HIVE_HARDFORK_1_27
43

5-
#define HIVE_HARDFORK_1_27_TIME 1654084800 // Wednesday, 1 June 2022 12:00:00
4+
long next_hf_time();
5+
#define HIVE_HARDFORK_1_27_TIME next_hf_time()
66

77
#define HIVE_HARDFORK_1_27_VERSION hive::protocol::hardfork_version( 1, 27 )
88

9+
// fix scheduling of timeshare witnesses to restore pre-hf26 behavior
10+
#define HIVE_HARDFORK_1_27_FIX_TIMESHARE_WITNESS_SCHEDULING (HIVE_HARDFORK_1_27)
11+
912
#endif

‎libraries/protocol/hardfork.d/1_28.hf

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#ifndef HIVE_HARDFORK_1_28
2+
#define HIVE_HARDFORK_1_28 28
3+
#define HIVE_SMT_HARDFORK HIVE_HARDFORK_1_28
4+
5+
#define HIVE_HARDFORK_1_28_TIME 1654084800 // Wednesday, 1 June 2022 12:00:00
6+
7+
#define HIVE_HARDFORK_1_28_VERSION hive::protocol::hardfork_version( 1, 28 )
8+
9+
#endif

‎libraries/protocol/include/hive/protocol/config.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ using namespace hive::protocol::testnet_blockchain_configuration;
3535
#ifdef IS_TEST_NET
3636

3737
#ifdef HIVE_ENABLE_SMT
38-
#define HIVE_BLOCKCHAIN_VERSION ( version(1, 27, 0) )
38+
#define HIVE_BLOCKCHAIN_VERSION ( version(1, 28, 0) )
3939
#else
40-
#define HIVE_BLOCKCHAIN_VERSION ( version(1, 26, 0) )
40+
#define HIVE_BLOCKCHAIN_VERSION ( version(1, 27, 0) )
4141
#endif
4242

4343
#define OLD_CHAIN_ID (fc::sha256::hash("testnet"))
@@ -89,7 +89,7 @@ using namespace hive::protocol::testnet_blockchain_configuration;
8989
/// LIVE HIVE NETWORK (MainNet) ///
9090
///////////////////////////////////////////////////////////////////////////////////////////////////
9191

92-
#define HIVE_BLOCKCHAIN_VERSION ( version(1, 26, 0) )
92+
#define HIVE_BLOCKCHAIN_VERSION ( version(1, 27, 0) )
9393

9494
#ifndef HIVE_INIT_PUBLIC_KEY_STR
9595
# define HIVE_INIT_PUBLIC_KEY_STR "STM8GC13uCZbP44HzMLV6zPZGwVQ8Nt4Kji8PapsPiNq1BK153XTX"

‎libraries/protocol/include/hive/protocol/hardfork_block.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@
2525
#define HIVE_HARDFORK_0_23_BLOCK 41818752
2626
#define HIVE_HARDFORK_1_24_BLOCK 47797680
2727
#define HIVE_HARDFORK_1_25_BLOCK 55235767
28-
#define HIVE_HARDFORK_1_26_BLOCK 100000000
28+
#define HIVE_HARDFORK_1_26_BLOCK 68676505
29+
#define HIVE_HARDFORK_1_27_BLOCK 100000000

‎tests/api_tests/message_format_tests/cli_wallet_tests/output_formatter_tests/__init__.py

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import pytest
2+
3+
pytest.register_assert_rewrite("tests.api_tests.message_format_tests.cli_wallet_tests.output_formatter_tests.local_tools")

‎tests/api_tests/message_format_tests/cli_wallet_tests/output_formatter_tests/block_log/generate_block_log.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import test_tools as tt
44

5-
from local_tools import create_account_and_fund_it
6-
75

86
def prepare_block_log_with_transactions():
97
node = tt.InitNode()
@@ -22,7 +20,7 @@ def prepare_block_log_with_transactions():
2220

2321

2422
def prepare_transactions(wallet) -> None:
25-
create_account_and_fund_it(wallet, 'alice', tests=tt.Asset.Test(100), vests=tt.Asset.Test(100))
23+
wallet.create_account('alice', hives=tt.Asset.Test(100), vests=tt.Asset.Test(100))
2624

2725
wallet.api.post_comment('alice', 'test-permlink', '', 'someone0', 'test-title', 'this is a body', '{}')
2826

‎tests/api_tests/message_format_tests/cli_wallet_tests/output_formatter_tests/test_get_order_book.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import test_tools as tt
77

88
from .local_tools import are_close, create_buy_order, create_sell_order, verify_json_patterns, verify_text_patterns
9-
from .....local_tools import create_account_and_fund_it
109

1110

1211
def test_get_order_book_json_format(node, wallet_with_json_formatter):
@@ -90,8 +89,8 @@ def parse_total_bids_and_asks(line_with_bids_summary: str, line_with_asks_summar
9089

9190
def prepare_accounts_and_orders(wallet):
9291
for account in ['alice', 'bob', 'carol', 'dan']:
93-
create_account_and_fund_it(wallet, account, tests=tt.Asset.Test(1000000),
94-
tbds=tt.Asset.Tbd(1000000), vests=tt.Asset.Test(1000000))
92+
wallet.create_account(account, hives=tt.Asset.Test(1000000), hbds=tt.Asset.Tbd(1000000),
93+
vests=tt.Asset.Test(1000000))
9594

9695
with wallet.in_single_transaction():
9796
buy_order0 = create_buy_order(wallet, 'alice', tt.Asset.Test(100), tt.Asset.Tbd(20), 0)

‎tests/api_tests/message_format_tests/cli_wallet_tests/output_formatter_tests/test_list_my_accounts.py

+20-21
Original file line numberDiff line numberDiff line change
@@ -4,64 +4,63 @@
44
import test_tools as tt
55

66
from .local_tools import verify_json_patterns, verify_text_patterns
7-
from .....local_tools import create_account_and_fund_it
87

98
BALANCES = {
109
'alice': {
11-
'tests': tt.Asset.Test(100),
10+
'hives': tt.Asset.Test(100),
1211
'vests': tt.Asset.Test(110),
13-
'tbds': tt.Asset.Tbd(120),
12+
'hbds': tt.Asset.Tbd(120),
1413
},
1514
'bob': {
16-
'tests': tt.Asset.Test(200),
15+
'hives': tt.Asset.Test(200),
1716
'vests': tt.Asset.Test(210),
18-
'tbds': tt.Asset.Tbd(220),
17+
'hbds': tt.Asset.Tbd(220),
1918
},
2019
'carol': {
21-
'tests': tt.Asset.Test(300),
20+
'hives': tt.Asset.Test(300),
2221
'vests': tt.Asset.Test(310),
23-
'tbds': tt.Asset.Tbd(320),
22+
'hbds': tt.Asset.Tbd(320),
2423
}
2524
}
2625

2726
TOTAL_BALANCES = {
28-
'tests': sum((balance['tests'] for balance in BALANCES.values()), start=tt.Asset.Test(0)),
29-
'tbds': sum((balance['tbds'] for balance in BALANCES.values()), start=tt.Asset.Tbd(0))
27+
'hives': sum((balance['hives'] for balance in BALANCES.values()), start=tt.Asset.Test(0)),
28+
'hbds': sum((balance['hbds'] for balance in BALANCES.values()), start=tt.Asset.Tbd(0))
3029
}
3130

3231

3332
def test_list_my_accounts_json_format(wallet_with_json_formatter):
3433
for name, balances in BALANCES.items():
35-
create_account_and_fund_it(wallet_with_json_formatter, name=name, **balances)
34+
wallet_with_json_formatter.create_account(name=name, **balances)
3635

3736
accounts_summary = wallet_with_json_formatter.api.list_my_accounts()
3837
for name, balances, returned_account in zip(BALANCES.keys(), BALANCES.values(), accounts_summary['accounts']):
3938
assert returned_account['name'] == name
40-
assert returned_account['balance'] == balances['tests'].as_nai()
41-
assert returned_account['hbd_balance'] == balances['tbds'].as_nai()
39+
assert returned_account['balance'] == balances['hives'].as_nai()
40+
assert returned_account['hbd_balance'] == balances['hbds'].as_nai()
4241

43-
assert accounts_summary['total_hive'] == TOTAL_BALANCES['tests'].as_nai()
44-
assert accounts_summary['total_hbd'] == TOTAL_BALANCES['tbds'].as_nai()
42+
assert accounts_summary['total_hive'] == TOTAL_BALANCES['hives'].as_nai()
43+
assert accounts_summary['total_hbd'] == TOTAL_BALANCES['hbds'].as_nai()
4544

4645

4746
def test_list_my_accounts_text_format(wallet_with_text_formatter):
4847
for name, balances in BALANCES.items():
49-
create_account_and_fund_it(wallet_with_text_formatter, name=name, **balances)
48+
wallet_with_text_formatter.create_account(name=name, **balances)
5049

5150
accounts_summary = parse_text_response(wallet_with_text_formatter.api.list_my_accounts())
5251

5352
for name, balances, returned_account in zip(BALANCES.keys(), BALANCES.values(), accounts_summary['accounts']):
5453
assert returned_account['name'] == name
55-
assert returned_account['balance'] == balances['tests']
56-
assert returned_account['hbd_balance'] == balances['tbds']
54+
assert returned_account['balance'] == balances['hives']
55+
assert returned_account['hbd_balance'] == balances['hbds']
5756

58-
assert accounts_summary['total_hive'] == TOTAL_BALANCES['tests']
59-
assert accounts_summary['total_hbd'] == TOTAL_BALANCES['tbds']
57+
assert accounts_summary['total_hive'] == TOTAL_BALANCES['hives']
58+
assert accounts_summary['total_hbd'] == TOTAL_BALANCES['hbds']
6059

6160

6261
def test_list_my_accounts_json_format_pattern_comparison(wallet_with_json_formatter):
6362
for name, balances in BALANCES.items():
64-
create_account_and_fund_it(wallet_with_json_formatter, name=name, **balances)
63+
wallet_with_json_formatter.create_account(name=name, **balances)
6564

6665
accounts_summary = wallet_with_json_formatter.api.list_my_accounts()
6766

@@ -70,7 +69,7 @@ def test_list_my_accounts_json_format_pattern_comparison(wallet_with_json_format
7069

7170
def test_list_my_accounts_text_format_pattern_comparison(wallet_with_text_formatter):
7271
for name, balances in BALANCES.items():
73-
create_account_and_fund_it(wallet_with_text_formatter, name=name, **balances)
72+
wallet_with_text_formatter.create_account(name=name, **balances)
7473

7574
accounts_summary = wallet_with_text_formatter.api.list_my_accounts()
7675

‎tests/api_tests/message_format_tests/condenser_api_tests/test_get_account_history.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import test_tools as tt
22

3-
from ..local_tools import create_account_and_fund_it, run_for
3+
from ..local_tools import run_for
44

55

66
@run_for('testnet', 'mainnet_5m', 'mainnet_64m')
77
def test_get_account_history(prepared_node, should_prepare):
88
if should_prepare:
99
wallet = tt.Wallet(attach_to=prepared_node)
10-
create_account_and_fund_it(wallet, 'alice', tbds=tt.Asset.Tbd(100), vests=tt.Asset.Test(100))
10+
wallet.create_account('alice', hbds=tt.Asset.Tbd(100), vests=tt.Asset.Test(100))
1111

1212
# Wait until block containing above transaction will become irreversible.
1313
prepared_node.wait_number_of_blocks(21)

‎tests/api_tests/message_format_tests/condenser_api_tests/test_get_active_votes.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import test_tools as tt
22

3-
from ..local_tools import create_account_and_fund_it, run_for
3+
from ..local_tools import run_for
44

55

66
@run_for('testnet', 'mainnet_5m', 'mainnet_64m')
77
def test_get_active_votes(prepared_node, should_prepare):
88
if should_prepare:
99
wallet = tt.Wallet(attach_to=prepared_node)
10-
create_account_and_fund_it(wallet, 'acidyo', tests=tt.Asset.Test(100), vests=tt.Asset.Test(100))
10+
wallet.create_account('acidyo', hives=tt.Asset.Test(100), vests=tt.Asset.Test(100))
1111
wallet.api.post_comment('acidyo', 'drew-an-avatar-signature-for-my-posts', '', 'test-parent-permlink', 'test-title', 'test-body', '{}')
1212
wallet.api.vote('initminer', 'acidyo', 'drew-an-avatar-signature-for-my-posts', 100, broadcast=True)
1313
prepared_node.api.condenser.get_active_votes('acidyo', 'drew-an-avatar-signature-for-my-posts')

‎tests/api_tests/message_format_tests/condenser_api_tests/test_get_conversion_request.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import test_tools as tt
22

3-
from ..local_tools import create_account_and_fund_it, run_for
3+
from ..local_tools import run_for
44

55

66
@run_for('testnet', 'mainnet_5m', 'mainnet_64m')
77
def test_get_conversion_request(prepared_node, should_prepare):
88
if should_prepare:
99
wallet = tt.Wallet(attach_to=prepared_node)
10-
create_account_and_fund_it(wallet, 'seanmclellan', tbds=tt.Asset.Tbd(100), vests=tt.Asset.Test(100))
10+
wallet.create_account('seanmclellan', hbds=tt.Asset.Tbd(100), vests=tt.Asset.Test(100))
1111
wallet.api.convert_hbd('seanmclellan', tt.Asset.Tbd(10))
1212
prepared_node.api.condenser.get_conversion_requests('seanmclellan')

‎tests/api_tests/message_format_tests/condenser_api_tests/test_get_expiring_vesting_delegations.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import test_tools as tt
22

3-
from ..local_tools import create_account_and_fund_it, create_and_cancel_vesting_delegation, date_from_now, run_for
3+
from ..local_tools import create_and_cancel_vesting_delegation, date_from_now, run_for
44

55

66
@run_for('testnet', 'mainnet_5m', 'mainnet_64m')
77
def test_get_expiring_vesting_delegations(prepared_node, should_prepare):
88
if should_prepare:
99
wallet = tt.Wallet(attach_to=prepared_node)
10-
11-
create_account_and_fund_it(wallet, 'alice', tests=tt.Asset.Test(100), vests=tt.Asset.Test(100))
10+
wallet.create_account('alice', hives=tt.Asset.Test(100), vests=tt.Asset.Test(100))
1211
wallet.api.create_account('initminer', 'bob', '{}')
1312
create_and_cancel_vesting_delegation(wallet, 'alice', 'bob')
1413
prepared_node.api.condenser.get_expiring_vesting_delegations('alice', date_from_now(weeks=0))

‎tests/api_tests/message_format_tests/condenser_api_tests/test_get_market_history.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import test_tools as tt
22

3-
from ..local_tools import create_account_and_fund_it, date_from_now, run_for
3+
from ..local_tools import date_from_now, run_for
44

55

66
@run_for('testnet', 'mainnet_5m', 'mainnet_64m')
77
def test_get_market_history(prepared_node, should_prepare):
88
if should_prepare:
99
wallet = tt.Wallet(attach_to=prepared_node)
10-
create_account_and_fund_it(wallet, 'alice', tests=tt.Asset.Test(100), vests=tt.Asset.Test(100))
10+
wallet.create_account('alice', hives=tt.Asset.Test(100), vests=tt.Asset.Test(100))
1111
wallet.api.create_order('alice', 0, tt.Asset.Test(50), tt.Asset.Tbd(5), False, 3600)
1212
wallet.api.create_order('initminer', 1, tt.Asset.Tbd(50), tt.Asset.Test(100), False, 3600)
1313
prepared_node.api.condenser.get_market_history(3600, date_from_now(weeks=-100), date_from_now(weeks=1))

‎tests/api_tests/message_format_tests/condenser_api_tests/test_get_open_orders.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import test_tools as tt
22

3-
from ..local_tools import create_account_and_fund_it, run_for
3+
from ..local_tools import run_for
44

55

66
@run_for('testnet', 'mainnet_5m', 'mainnet_64m')
77
def test_get_open_orders(prepared_node, should_prepare):
88
if should_prepare:
99
wallet = tt.Wallet(attach_to=prepared_node)
10-
create_account_and_fund_it(wallet, 'abit', tests=tt.Asset.Test(100), vests=tt.Asset.Test(100))
10+
wallet.create_account('abit', hives=tt.Asset.Test(100), vests=tt.Asset.Test(100))
1111
wallet.api.create_order('abit', 0, tt.Asset.Test(50), tt.Asset.Tbd(5), False, 3600)
1212
prepared_node.api.condenser.get_open_orders('abit')

‎tests/api_tests/message_format_tests/condenser_api_tests/test_get_order_book.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import test_tools as tt
22

3-
from ..local_tools import create_account_and_fund_it, run_for
3+
from ..local_tools import run_for
44

55

66
@run_for('testnet', 'mainnet_5m', 'mainnet_64m')
77
def test_get_order_book(prepared_node, should_prepare):
88
if should_prepare:
99
wallet = tt.Wallet(attach_to=prepared_node)
10-
create_account_and_fund_it(wallet, 'alice', tests=tt.Asset.Test(100), vests=tt.Asset.Test(100))
11-
create_account_and_fund_it(wallet, 'bob', tests=tt.Asset.Test(100), vests=tt.Asset.Test(100),
12-
tbds=tt.Asset.Tbd(100))
10+
wallet.create_account('alice', hives=tt.Asset.Test(100), vests=tt.Asset.Test(100))
11+
wallet.create_account('bob', hives=tt.Asset.Test(100), vests=tt.Asset.Test(100),
12+
hbds=tt.Asset.Tbd(100))
1313

1414
wallet.api.create_order('alice', 1, tt.Asset.Test(100), tt.Asset.Tbd(50), False, 3600)
1515
wallet.api.create_order('bob', 2, tt.Asset.Tbd(20), tt.Asset.Test(100), False, 3600)

0 commit comments

Comments
 (0)