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

[3.2] grab bag of warning fixes #743

Merged
merged 2 commits into from
Aug 6, 2022
Merged

[3.2] grab bag of warning fixes #743

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5449f5b
grab bag of warning fixes
spoonincode Aug 3, 2022
507ba01
revert token test's asset warning fix for now
spoonincode Aug 5, 2022
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
2 changes: 1 addition & 1 deletion plugins/resource_monitor_plugin/test/test_threshold.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ struct threshold_fixture {
set_threshold(80, warning_threshold);
set_shutdown_on_exceeded(true);

for (auto i = 0; i < available.size(); i++) {
for (size_t i = 0; i < available.size(); i++) {
add_file_system("/test" + std::to_string(i));
}

Expand Down
4 changes: 2 additions & 2 deletions unittests/eosio.token_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ BOOST_FIXTURE_TEST_CASE( create_max_supply, eosio_token_tester ) try {
share_type amount = 4611686018427387904;
static_assert(sizeof(share_type) <= sizeof(asset), "asset changed so test is no longer valid");
static_assert(std::is_trivially_copyable<asset>::value, "asset is not trivially copyable");
memcpy(&max, &amount, sizeof(share_type)); // hack in an invalid amount
memcpy((char*)&max, &amount, sizeof(share_type)); // hack in an invalid amount

BOOST_CHECK_EXCEPTION( create( "alice"_n, max) , asset_type_exception, [](const asset_type_exception& e) {
return expect_assert_message(e, "magnitude of asset amount must be less than 2^62");
Expand All @@ -177,7 +177,7 @@ BOOST_FIXTURE_TEST_CASE( create_max_decimals, eosio_token_tester ) try {
share_type amount = 0x8ac7230489e80000L;
static_assert(sizeof(share_type) <= sizeof(asset), "asset changed so test is no longer valid");
static_assert(std::is_trivially_copyable<asset>::value, "asset is not trivially copyable");
memcpy(&max, &amount, sizeof(share_type)); // hack in an invalid amount
memcpy((char*)&max, &amount, sizeof(share_type)); // hack in an invalid amount
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These were copying an object of non-trivial type warnings. Gnarly fix but, well, comment says it's a hack 😉

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed this fix for now, so the other clearly correct ones can be fast pathed in


BOOST_CHECK_EXCEPTION( create( "alice"_n, max) , asset_type_exception, [](const asset_type_exception& e) {
return expect_assert_message(e, "magnitude of asset amount must be less than 2^62");
Expand Down
12 changes: 6 additions & 6 deletions unittests/state_history_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class table_deltas_tester : public tester {
template <typename A, typename B>
vector<A> deserialize_data(deltas_vector::iterator &it) {
vector<A> result;
for(int i=0; i < it->rows.obj.size(); i++) {
for(size_t i=0; i < it->rows.obj.size(); i++) {
eosio::input_stream stream{it->rows.obj[i].second.data(), it->rows.obj[i].second.size()};
result.push_back(std::get<A>(eosio::from_bin<B>(stream)));
}
Expand Down Expand Up @@ -120,7 +120,7 @@ BOOST_AUTO_TEST_CASE(test_deltas_account_permission) {
auto &it_permission = result.second;
BOOST_REQUIRE_EQUAL(it_permission->rows.obj.size(), 2);
auto accounts_permissions = chain.deserialize_data<eosio::ship_protocol::permission_v0, eosio::ship_protocol::permission>(it_permission);
for(int i = 0; i < accounts_permissions.size(); i++)
for(size_t i = 0; i < accounts_permissions.size(); i++)
{
BOOST_REQUIRE_EQUAL(it_permission->rows.obj[i].first, true);
BOOST_REQUIRE_EQUAL(accounts_permissions[i].owner.to_string(), "newacc");
Expand Down Expand Up @@ -285,7 +285,7 @@ BOOST_AUTO_TEST_CASE(test_deltas_protocol_feature_history) {

auto digest_byte_array = protocol_feature.feature_digest.extract_as_byte_array();
char digest_array[digest_byte_array.size()];
for(int i=0; i < digest_byte_array.size(); i++) digest_array[i] = digest_byte_array[i];
for(size_t i=0; i < digest_byte_array.size(); i++) digest_array[i] = digest_byte_array[i];
eosio::chain::digest_type digest_in_delta(digest_array, digest_byte_array.size());

BOOST_REQUIRE_EQUAL(digest_in_delta, *d);
Expand Down Expand Up @@ -490,7 +490,7 @@ BOOST_AUTO_TEST_CASE(test_deltas_resources_history) {

std::multiset<std::string> expected_contract_row_table_names {"abihash", "abihash", "hashobjs", "hashobjs", "hashobjs", "numobjs", "numobjs", "numobjs"};

std::multiset<uint64_t> expected_contract_row_table_primary_keys {6138663577826885632,14605619288908759040, 0, 1 ,2, 0, 1, 2};
std::multiset<uint64_t> expected_contract_row_table_primary_keys {6138663577826885632U,14605619288908759040U, 0, 1 ,2, 0, 1, 2};
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

integer constant is so large that it is unsigned

std::multiset<std::string> result_contract_row_table_names;
std::multiset<uint64_t> result_contract_row_table_primary_keys;
for(auto &contract_row : contract_rows) {
Expand All @@ -514,7 +514,7 @@ BOOST_AUTO_TEST_CASE(test_deltas_resources_history) {
BOOST_REQUIRE_EQUAL(it_contract_row->rows.obj.size(), 2);
contract_rows = chain.deserialize_data<eosio::ship_protocol::contract_row_v0, eosio::ship_protocol::contract_row>(it_contract_row);

for(int i=0; i < contract_rows.size(); i++) {
for(size_t i=0; i < contract_rows.size(); i++) {
BOOST_REQUIRE_EQUAL(it_contract_row->rows.obj[i].first, 0);
BOOST_REQUIRE_EQUAL(contract_rows[i].table.to_string(), "numobjs");
}
Expand All @@ -525,7 +525,7 @@ BOOST_AUTO_TEST_CASE(test_deltas_resources_history) {
BOOST_REQUIRE_EQUAL(it_contract_index_double->rows.obj.size(), 2);
auto contract_index_double_elems = chain.deserialize_data<eosio::ship_protocol::contract_index_double_v0, eosio::ship_protocol::contract_index_double>(it_contract_index_double);

for(int i=0; i < contract_index_double_elems.size(); i++) {
for(size_t i=0; i < contract_index_double_elems.size(); i++) {
BOOST_REQUIRE_EQUAL(it_contract_index_double->rows.obj[i].first, 0);
BOOST_REQUIRE_EQUAL(contract_index_double_elems[i].table.to_string(), "numobjs.....2");
}
Expand Down