Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

system contract cleanup: remove special handling for eosio #3431

Merged
merged 7 commits into from
May 25, 2018
Merged

system contract cleanup: remove special handling for eosio #3431

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fe2296e
system contract cleanup: remove special handling for eosio delegating…
moskvanaft May 25, 2018
ec7151c
system contract cleanup: fixed and put back check for eosio balance #…
moskvanaft May 25, 2018
0770df7
fix eosio_msig_tests #3430
arhag May 25, 2018
94a72c4
Merge branch 'master' into system-remove-eosio-specialcases
arhag May 25, 2018
6fedf84
Merge branch 'master' into system-remove-eosio-specialcases
May 25, 2018
71c71f2
Merge branch 'master' into system-remove-eosio-specialcases
May 25, 2018
7358715
Merge branch 'system-remove-eosio-specialcases' of https://github.com…
arhag May 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions contracts/eosio.system/delegate_bandwidth.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,10 @@ namespace eosiosystem {
auto quant_after_fee = quant;
quant_after_fee.amount -= fee.amount;

if( payer != N(eosio) ) {
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {payer,N(active)},
{ payer, N(eosio.ram), quant_after_fee, std::string("buy ram") } );
}
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {payer,N(active)},
{ payer, N(eosio.ram), quant_after_fee, std::string("buy ram") } );

if( payer != N(eosio) && fee.amount > 0 ) {
if( fee.amount > 0 ) {
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {payer,N(active)},
{ payer, N(eosio.ramfee), fee, std::string("ram fee") } );
}
Expand Down Expand Up @@ -182,14 +180,12 @@ namespace eosiosystem {
});
set_resource_limits( res_itr->owner, res_itr->ram_bytes, res_itr->net_weight.amount, res_itr->cpu_weight.amount );

if( N(eosio) != account ) {
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {N(eosio.ram),N(active)},
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {N(eosio.ram),N(active)},
{ N(eosio.ram), account, asset(tokens_out), std::string("sell ram") } );
auto fee = tokens_out.amount / 200;
if( fee > 0 ) {
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {account,N(active)},
{ account, N(eosio.ramfee), asset(fee), std::string("sell ram fee") } );
}
auto fee = tokens_out.amount / 200;
if( fee > 0 ) {
INLINE_ACTION_SENDER(eosio::token, transfer)( N(eosio.token), {account,N(active)},
{ account, N(eosio.ramfee), asset(fee), std::string("sell ram fee") } );
}
}

Expand Down
2 changes: 0 additions & 2 deletions unittests/eosio.system_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ BOOST_AUTO_TEST_SUITE(eosio_system_tests)

BOOST_FIXTURE_TEST_CASE( buysell, eosio_system_tester ) try {

BOOST_REQUIRE_EQUAL( core_from_string("1000000000.0000"), get_balance( "eosio" ) + get_balance( "eosio.ramfee" ) + get_balance( "eosio.stake" ) );
BOOST_REQUIRE_EQUAL( core_from_string("0.0000"), get_balance( "alice1111111" ) );

transfer( "eosio", "alice1111111", core_from_string("1000.0000"), "eosio" );
Expand Down Expand Up @@ -119,7 +118,6 @@ BOOST_FIXTURE_TEST_CASE( buysell, eosio_system_tester ) try {

BOOST_FIXTURE_TEST_CASE( stake_unstake, eosio_system_tester ) try {

BOOST_REQUIRE_EQUAL( core_from_string("1000000000.0000"), get_balance( "eosio" ) + get_balance( "eosio.ramfee" ) + get_balance( "eosio.stake" ) );
BOOST_REQUIRE_EQUAL( core_from_string("0.0000"), get_balance( "alice1111111" ) );
transfer( "eosio", "alice1111111", core_from_string("1000.0000"), "eosio" );

Expand Down
3 changes: 1 addition & 2 deletions unittests/eosio_system_tester.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ class eosio_system_tester : public TESTER {
create_account_with_resources( N(bob111111111), config::system_account_name, core_from_string("0.4500"), false );
create_account_with_resources( N(carol1111111), config::system_account_name, core_from_string("1.0000"), false );


BOOST_REQUIRE_EQUAL( core_from_string("1000000000.0000"), get_balance("eosio") + get_balance("eosio.ramfee") + get_balance("eosio.stake"));
BOOST_REQUIRE_EQUAL( core_from_string("1000000000.0000"), get_balance("eosio") + get_balance("eosio.ramfee") + get_balance("eosio.stake") + get_balance("eosio.ram") );
}


Expand Down