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

Jump to bottom

Add missing is_virtual field in account history in ES, and fix a related API #2730

Merged
merged 5 commits into from
Mar 20, 2023
Merged

Add missing is_virtual field in account history in ES, and fix a related API #2730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
778fa64
Add `is_virtual` field in account history in ES
abitmore Mar 19, 2023
56b8d19
Fix missing data in es_plugin::get_account_history
abitmore Mar 19, 2023
bfa0401
Add tests for es_plugin::get_acc_his missing data
abitmore Mar 19, 2023
d226bd9
Merge branch 'develop' into is-virtual-field-in-es
abitmore Mar 20, 2023
887203c
Bump DB_VERSION
abitmore Mar 20, 2023
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 libraries/chain/include/graphene/chain/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#define GRAPHENE_MAX_NESTED_OBJECTS (200)

const std::string GRAPHENE_CURRENT_DB_VERSION = "20230319";
const std::string GRAPHENE_CURRENT_DB_VERSION = "20230320";

#define GRAPHENE_RECENTLY_MISSED_COUNT_INCREMENT 4
#define GRAPHENE_RECENTLY_MISSED_COUNT_DECREMENT 3
Expand Down
4 changes: 4 additions & 0 deletions libraries/plugins/elasticsearch/elasticsearch_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ void elasticsearch_plugin_impl::doOperationHistory( const optional <operation_hi
os.trx_in_block = oho->trx_in_block;
os.op_in_trx = oho->op_in_trx;
os.virtual_op = oho->virtual_op;
os.is_virtual = oho->is_virtual;
os.fee_payer = oho->op.visit( get_fee_payer_visitor() );

if(_options.operation_string)
Expand Down Expand Up @@ -611,6 +612,9 @@ static operation_history_object fromEStoOperation(const variant& source)
result.trx_in_block = source["operation_history"]["trx_in_block"].as_uint64();
result.op_in_trx = source["operation_history"]["op_in_trx"].as_uint64();
result.trx_in_block = source["operation_history"]["virtual_op"].as_uint64();
result.is_virtual = source["operation_history"]["is_virtual"].as_bool();

result.block_time = fc::time_point_sec::from_iso_string( source["block_data"]["block_time"].as_string() );

return result;
}
Expand Down
3 changes: 2 additions & 1 deletion libraries/plugins/elasticsearch/include/graphene/elasticsearch/elasticsearch_plugin.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ struct operation_history_struct {
uint16_t trx_in_block;
uint16_t op_in_trx;
uint32_t virtual_op;
bool is_virtual;
account_id_type fee_payer;
std::string op;
std::string operation_result;
Expand Down Expand Up @@ -147,7 +148,7 @@ struct bulk_struct {

FC_REFLECT_ENUM( graphene::elasticsearch::mode, (only_save)(only_query)(all) )
FC_REFLECT( graphene::elasticsearch::operation_history_struct,
(trx_in_block)(op_in_trx)(virtual_op)(fee_payer)
(trx_in_block)(op_in_trx)(virtual_op)(is_virtual)(fee_payer)
(op)(operation_result)(op_object)(operation_result_object) )
FC_REFLECT( graphene::elasticsearch::block_struct, (block_num)(block_time)(trx_id) )
FC_REFLECT( graphene::elasticsearch::fee_struct, (asset)(asset_name)(amount)(amount_units) )
Expand Down
49 changes: 48 additions & 1 deletion tests/elasticsearch/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ BOOST_AUTO_TEST_CASE(elasticsearch_account_history) {
BOOST_CHECK_EQUAL(last_transfer_amount, "300");
auto last_transfer_payer = j["_source"]["operation_history"]["fee_payer"].as_string();
BOOST_CHECK_EQUAL(last_transfer_payer, "1.2.0");
auto is_virtual = j["_source"]["operation_history"]["is_virtual"].as_bool();
BOOST_CHECK( !is_virtual );

// To test credit offers
generate_blocks( HARDFORK_CORE_2362_TIME );
Expand Down Expand Up @@ -375,6 +377,9 @@ BOOST_AUTO_TEST_CASE(elasticsearch_history_api) {
BOOST_CHECK_EQUAL(histories[2].id.instance(), 1u);
BOOST_CHECK_EQUAL(histories[3].id.instance(), 0u);

BOOST_CHECK( !histories[0].is_virtual );
BOOST_CHECK( histories[0].block_time == db.head_block_time() );

// f(A, 0, 4, 6) = { 5, 3, 1, 0 }
histories = hist_api.get_account_history("1.2.0", operation_history_id_type(), 4, operation_history_id_type(6));
BOOST_REQUIRE_EQUAL(histories.size(), 4u);
Expand Down Expand Up @@ -627,7 +632,8 @@ BOOST_AUTO_TEST_CASE(elasticsearch_history_api) {
BOOST_CHECK_EQUAL(histories.size(), 0u);

// create a new account C = alice { 7 }
create_account("alice");
auto alice = create_account("alice");
account_id_type alice_id = alice.get_id();

generate_block();

Expand Down Expand Up @@ -662,6 +668,47 @@ BOOST_AUTO_TEST_CASE(elasticsearch_history_api) {
}, "thread invoke for method " BOOST_PP_STRINGIZE(method_name)).wait();
BOOST_REQUIRE( his_obj7.op.is_type<account_create_operation>() );
BOOST_CHECK_EQUAL( his_obj7.op.get<account_create_operation>().name, "alice" );

// Test virtual operation

// Prepare funds
transfer( account_id_type()(db), alice_id(db), asset(100) );
// Create a limit order that expires in 300 seconds
create_sell_order( alice_id, asset(1), asset(1, asset_id_type(1)), db.head_block_time() + 300 );

generate_block();

// f(C, 0, 4, 0) = { 9, 8, 7 }
fc::wait_for( ES_WAIT_TIME, [&]() {
histories = hist_api.get_account_history(
"alice", operation_history_id_type(0), 4, operation_history_id_type(0));
return (histories.size() == 3u);
});
BOOST_REQUIRE_EQUAL(histories.size(), 3u);
BOOST_CHECK( histories[0].op.is_type<limit_order_create_operation>() );
BOOST_CHECK( !histories[0].is_virtual );
BOOST_CHECK( histories[0].block_time == db.head_block_time() );
BOOST_CHECK( histories[1].op.is_type<transfer_operation>() );
BOOST_CHECK( !histories[1].is_virtual );

// Let the limit order expire
generate_blocks( db.head_block_time() + 300 );
generate_block();

// f(C, 0, 4, 0) = { 10, 9, 8, 7 }
fc::wait_for( ES_WAIT_TIME, [&]() {
histories = hist_api.get_account_history(
"alice", operation_history_id_type(0), 4, operation_history_id_type(0));
return (histories.size() == 4u);
});
BOOST_REQUIRE_EQUAL(histories.size(), 4u);
BOOST_CHECK( histories[0].op.is_type<limit_order_cancel_operation>() );
BOOST_CHECK( histories[0].is_virtual );
BOOST_CHECK( histories[1].op.is_type<limit_order_create_operation>() );
BOOST_CHECK( !histories[1].is_virtual );
BOOST_CHECK( histories[2].op.is_type<transfer_operation>() );
BOOST_CHECK( !histories[2].is_virtual );

}
}
catch (fc::exception &e) {
Expand Down