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

Refactor code about object_id and object_id_type #2658

Merged
merged 11 commits into from
Oct 23, 2022
Merged

Refactor code about object_id and object_id_type #2658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bd440cf
Refactor code about object_id and object_id_type
abitmore Oct 13, 2022
c761429
Bump ZLIB version
abitmore Oct 18, 2022
a7587b5
Refactor code and fix code smells
abitmore Oct 18, 2022
ddfbb6d
Fix code smells
abitmore Oct 19, 2022
b1a89b9
Remove a redundant function and refactor some code
abitmore Oct 19, 2022
534529b
Add safeguard code to add_index()
abitmore Oct 19, 2022
ec587e8
Skip plugins in app_test
abitmore Oct 20, 2022
9c5aa13
Update CMake library linking order
abitmore Oct 20, 2022
d1423a0
Fix code smells
abitmore Oct 20, 2022
b5de525
Avoid overflow in from_variant(object_id)
abitmore Oct 21, 2022
069e291
Add a default value to fill_order_op::is_maker
abitmore Oct 22, 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 .github/workflows/build-and-test.win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
BOOST_DOTTED_VERSION: 1.69.0
CURL_VERSION: 7.67.0
OPENSSL_VERSION: 1.1.1d
ZLIB_VERSION: 1.2.12
ZLIB_VERSION: 1.2.13
jobs:
prepare-mingw64-libs:
name: Build required 3rd-party libraries
Expand Down
4 changes: 2 additions & 2 deletions libraries/app/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ add_library( graphene_app
# need to link graphene_debug_witness because plugins aren't sufficiently isolated #246
target_link_libraries( graphene_app
graphene_market_history graphene_account_history graphene_elasticsearch graphene_grouped_orders
graphene_api_helper_indexes graphene_custom_operations
graphene_chain fc graphene_db graphene_net graphene_utilities graphene_debug_witness )
graphene_api_helper_indexes graphene_custom_operations graphene_debug_witness
graphene_chain graphene_net graphene_utilities fc )
target_include_directories( graphene_app
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include"
"${CMAKE_CURRENT_SOURCE_DIR}/../egenesis/include" )
Expand Down
32 changes: 16 additions & 16 deletions libraries/app/api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,8 +382,8 @@ namespace graphene { namespace app {
FC_ASSERT(_app.chain_database());
const auto& db = *_app.chain_database();
database_api_helper db_api_helper( _app );
asset_id_type a = db_api_helper.get_asset_from_string( asset_a )->id;
asset_id_type b = db_api_helper.get_asset_from_string( asset_b )->id;
asset_id_type a = db_api_helper.get_asset_from_string( asset_a )->get_id();
asset_id_type b = db_api_helper.get_asset_from_string( asset_b )->get_id();
if( a > b ) std::swap(a,b);
const auto& history_idx = db.get_index_type<graphene::market_history::history_index>().indices().get<by_key>();
history_key hkey;
Expand Down Expand Up @@ -426,7 +426,7 @@ namespace graphene { namespace app {
account_id_type account;
try {
database_api_helper db_api_helper( _app );
account = db_api_helper.get_account_from_string(account_id_or_name)->id;
account = db_api_helper.get_account_from_string(account_id_or_name)->get_id();
} catch(...) { return result; }

if(_app.is_plugin_enabled("elasticsearch")) {
Expand Down Expand Up @@ -479,8 +479,8 @@ namespace graphene { namespace app {
account_id_type account;
try {
database_api_helper db_api_helper( _app );
account = db_api_helper.get_account_from_string(account_name_or_id)->id;
} catch(...) { return result; }
account = db_api_helper.get_account_from_string(account_name_or_id)->get_id();
} catch( const fc::exception& ) { return result; }

fc::time_point_sec start = ostart.valid() ? *ostart : fc::time_point_sec::maximum();

Expand All @@ -490,7 +490,7 @@ namespace graphene { namespace app {
return result;

const auto& acc_hist_idx = db.get_index_type<account_history_index>().indices().get<by_op>();
auto itr = acc_hist_idx.lower_bound( boost::make_tuple( account, op_hist_itr->id ) );
auto itr = acc_hist_idx.lower_bound( boost::make_tuple( account, op_hist_itr->get_id() ) );
auto itr_end = acc_hist_idx.upper_bound( account );

while( itr != itr_end && result.size() < limit )
Expand Down Expand Up @@ -521,7 +521,7 @@ namespace graphene { namespace app {
account_id_type account;
try {
database_api_helper db_api_helper( _app );
account = db_api_helper.get_account_from_string(account_id_or_name)->id;
account = db_api_helper.get_account_from_string(account_id_or_name)->get_id();
} catch(...) { return result; }
const auto& stats = account(db).statistics(db);
if( stats.most_recent_op == account_history_id_type() ) return result;
Expand All @@ -541,7 +541,7 @@ namespace graphene { namespace app {
else node = &node->next(db);
}
if( stop.instance.value == 0 && result.size() < limit ) {
auto head = db.find(account_history_id_type());
const auto* head = db.find(account_history_id_type());
if (head != nullptr && head->account == account && head->operation_id(db).op.which() == operation_type)
result.push_back(head->operation_id(db));
}
Expand All @@ -566,7 +566,7 @@ namespace graphene { namespace app {
account_id_type account;
try {
database_api_helper db_api_helper( _app );
account = db_api_helper.get_account_from_string(account_id_or_name)->id;
account = db_api_helper.get_account_from_string(account_id_or_name)->get_id();
} catch(...) { return result; }
const auto& stats = account(db).statistics(db);
if( start == 0 )
Expand Down Expand Up @@ -674,8 +674,8 @@ namespace graphene { namespace app {

const auto& db = *_app.chain_database();
database_api_helper db_api_helper( _app );
asset_id_type a = db_api_helper.get_asset_from_string( asset_a )->id;
asset_id_type b = db_api_helper.get_asset_from_string( asset_b )->id;
asset_id_type a = db_api_helper.get_asset_from_string( asset_a )->get_id();
asset_id_type b = db_api_helper.get_asset_from_string( asset_b )->get_id();
vector<bucket_object> result;
const auto configured_limit = _app.get_options().api_limit_get_market_history;
result.reserve( configured_limit );
Expand Down Expand Up @@ -899,7 +899,7 @@ namespace graphene { namespace app {
("configured_limit", configured_limit) );

database_api_helper db_api_helper( _app );
asset_id_type asset_id = db_api_helper.get_asset_from_string( asset_symbol_or_id )->id;
asset_id_type asset_id = db_api_helper.get_asset_from_string( asset_symbol_or_id )->get_id();
const auto& bal_idx = _db.get_index_type< account_balance_index >().indices().get< by_asset_balance >();
auto range = bal_idx.equal_range( boost::make_tuple( asset_id ) );

Expand Down Expand Up @@ -933,7 +933,7 @@ namespace graphene { namespace app {
int64_t asset_api::get_asset_holders_count( const std::string& asset_symbol_or_id ) const {
const auto& bal_idx = _db.get_index_type< account_balance_index >().indices().get< by_asset_balance >();
database_api_helper db_api_helper( _app );
asset_id_type asset_id = db_api_helper.get_asset_from_string( asset_symbol_or_id )->id;
asset_id_type asset_id = db_api_helper.get_asset_from_string( asset_symbol_or_id )->get_id();
auto range = bal_idx.equal_range( boost::make_tuple( asset_id ) );

int64_t count = boost::distance(range) - 1;
Expand Down Expand Up @@ -996,8 +996,8 @@ namespace graphene { namespace app {
vector< limit_order_group > result;

database_api_helper db_api_helper( _app );
asset_id_type base_asset_id = db_api_helper.get_asset_from_string( base_asset )->id;
asset_id_type quote_asset_id = db_api_helper.get_asset_from_string( quote_asset )->id;
asset_id_type base_asset_id = db_api_helper.get_asset_from_string( base_asset )->get_id();
asset_id_type quote_asset_id = db_api_helper.get_asset_from_string( quote_asset )->get_id();

price max_price = price::max( base_asset_id, quote_asset_id );
price min_price = price::min( base_asset_id, quote_asset_id );
Expand Down Expand Up @@ -1037,7 +1037,7 @@ namespace graphene { namespace app {
if( o_account_name_or_id.valid() )
{
const string& account_name_or_id = *o_account_name_or_id;
const account_id_type account_id = db_api_helper.get_account_from_string(account_name_or_id)->id;
const account_id_type account_id = db_api_helper.get_account_from_string(account_name_or_id)->get_id();
if( catalog.valid() )
{
if( key.valid() )
Expand Down
Loading