Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed #20Using greylist-account while starting nodeos for the first time throws exception #23

Merged
merged 7 commits into from
Jan 8, 2019
Merged

fixed #20Using greylist-account while starting nodeos for the first time throws exception #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a884b8b
restart sync list db
vvvictorlee Dec 8, 2018
58ab31a
recovery system account bos to eosio
vvvictorlee Dec 12, 2018
5b58ecb
recovery system account bos to eosio
vvvictorlee Dec 12, 2018
c884627
recovery system account bos to eosio
vvvictorlee Dec 12, 2018
8c45e8c
Merge pull request #1 from boscore/develop
vlbos Dec 22, 2018
b9d89d4
catch exception plugin initialize sync list before initialize database
vvvictorlee Jan 4, 2019
057b8a3
catch exception plugin initialize sync list before initialize database
vvvictorlee Jan 4, 2019
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
15 changes: 11 additions & 4 deletions libraries/chain/controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,10 +741,17 @@ struct controller_impl {

void sync_name_list(list_type list,bool isMerge=false)
{
const auto &gpo2 = db.get<global_property2_object>();
db.modify(gpo2, [&](auto &gprops2) {
sync_list_and_db(list, gprops2,isMerge);
});
try
{
const auto &gpo2 = db.get<global_property2_object>();
db.modify(gpo2, [&](auto &gprops2) {
sync_list_and_db(list, gprops2, isMerge);
});
}
catch (...)
{
wlog("plugin initialize sync list ignore before initialize database");
}
}

// "bos end"
Expand Down
31 changes: 18 additions & 13 deletions unittests/database_gmr_blklst_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,20 +73,25 @@ BOOST_AUTO_TEST_CASE(set_name_list_test)
vector<name> list = parse_list_string(str);

flat_set<account_name> nameset(list.begin(), list.end());
// Create an account
db.create<account_object>([](account_object &a) {
a.name = "alice";
});

test.control->set_actor_blacklist(nameset);

test.control->add_resource_greylist(N(alice));

// Make sure we can retrieve that account by name
const global_property2_object &ptr = db.get<global_property2_object>();

// Create an account
db.modify(ptr, [&](global_property2_object &a) {
a.cfg.actor_blacklist = {N(a)};
a.cfg.contract_blacklist = {N(a)};
a.cfg.resource_greylist = {N(a)};
// a.cfg.actor_blacklist = {N(a)};
// a.cfg.contract_blacklist = {N(a)};
// a.cfg.resource_greylist = {N(a)};
});

int64_t lt = static_cast<int64_t>(list_type::actor_blacklist_type);
int64_t lt = static_cast<int64_t>(list_type::resource_greylist_type);
int64_t lat = static_cast<int64_t>(list_action_type::insert_type);
test.control->set_name_list(lt, lat, list);

Expand Down Expand Up @@ -114,24 +119,24 @@ BOOST_AUTO_TEST_CASE(set_name_list_test)
const global_property2_object &ptr1 = db.get<global_property2_object>();
chain_config2 c = ptr1.cfg;

BOOST_TEST(c.actor_blacklist.size() == 4);
BOOST_TEST(ab.size() == 4);
BOOST_TEST(c.resource_greylist.size() == 1);
BOOST_TEST(rg.size() == 1);

convert_names(c.actor_blacklist, aab);
convert_names(c.contract_blacklist, acb);
convert_names(c.resource_greylist, arg);


if (c.actor_blacklist.size() == 4)
if (c.resource_greylist.size() == 1)
{

bool b = (aab.find(N(a)) != aab.end());
BOOST_TEST(b);
// bool b = (aab.find(N(a)) != aab.end());
// BOOST_TEST(b);
}

bool d = ab.find(N(a)) != ab.end();
BOOST_TEST(d);
bool m = aab.find(N(alice)) != aab.end();
// bool d = ab.find(N(a)) != ab.end();
// BOOST_TEST(d);
bool m = arg.find(N(alice)) != arg.end();
BOOST_TEST(m);

// Undo creation of the account
Expand Down