Skip to content

Commit 306dbd6

Browse files
Mariusz-TrelaMariusz-Trela
committed
Issue #722 - condenser_api should return the actual operation body
1 parent 1570622 commit 306dbd6

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

‎libraries/protocol/include/hive/protocol/block_header.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ struct variant_creator_functor< block_header_extensions >
5151
template<typename T>
5252
fc::variant operator()( const T& v ) const
5353
{
54-
return extended_variant_creator_functor< block_header_extensions >().create( v );
54+
return extended_variant_creator_functor< block_header_extensions >().create( v, block_header_extensions::tag<T>::value );
5555
}
5656
};
5757

‎libraries/protocol/include/hive/protocol/dhf_operations.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ namespace fc
162162
template<typename T>
163163
fc::variant operator()( const T& v ) const
164164
{
165-
return extended_variant_creator_functor< update_proposal_extension >().create( v );
165+
return extended_variant_creator_functor< update_proposal_extension >().create( v, update_proposal_extension::tag<T>::value );
166166
}
167167
};
168168
}

‎libraries/protocol/include/hive/protocol/hive_operations.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1157,7 +1157,7 @@ namespace fc
11571157
template<typename T>
11581158
fc::variant operator()( const T& v ) const
11591159
{
1160-
return extended_variant_creator_functor< pow2_work >().create( v );
1160+
return extended_variant_creator_functor< pow2_work >().create( v, pow2_work::tag<T>::value );
11611161
}
11621162
};
11631163

‎tests/python/functional/cli_wallet/test_proposal.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def check_is_proposal_update_exists(block_number: int, end_date: date_type) -> b
111111

112112
op = response[0]["op"]
113113
extensions = op[1]["extensions"][0]
114-
return extensions[0] == "update_proposal_end_date" and extensions[1]["end_date"] == end_date
114+
return extensions[0] == 1 and extensions[1]["end_date"] == end_date
115115

116116
author = funded_account.account
117117
current_daily_pay = tt.Asset.Tbd(10)

‎tests/python/functional/transaction_serialization_tests/cli_wallet/transaction_pattern_tests/dumped_files_legacy_wallet/update_proposal.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"ref_block_num":30,"ref_block_prefix":1561542156,"expiration":"2023-01-02T11:26:57","operations":[["update_proposal",{"proposal_id":0,"creator":"alice","daily_pay":"10.000 TBD","subject":"subject-1","permlink":"permlink","extensions":[["update_proposal_end_date",{"end_date":"2031-05-01T00:00:00"}]]}]],"extensions":[],"signatures":["1f0c8207d3f28e70c33af1f5f7be1c18a10c14692030d732ca12d39a402eb5bd2c6d4d3b91806e6d349dd1e310eec6a55a99b92e76989f1c972a9834b97e9c5682"]}
1+
{"ref_block_num":30,"ref_block_prefix":1561542156,"expiration":"2023-01-02T11:26:57","operations":[["update_proposal",{"proposal_id":0,"creator":"alice","daily_pay":"10.000 TBD","subject":"subject-1","permlink":"permlink","extensions":[[1,{"end_date":"2031-05-01T00:00:00"}]]}]],"extensions":[],"signatures":["1f0c8207d3f28e70c33af1f5f7be1c18a10c14692030d732ca12d39a402eb5bd2c6d4d3b91806e6d349dd1e310eec6a55a99b92e76989f1c972a9834b97e9c5682"]}

‎tests/python/functional/transaction_serialization_tests/test_extension_serialization_format.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def test_change_comment_operation(node, api, expected_extension):
6666
("api", "expected_extension"),
6767
[
6868
("block", {"type": "update_proposal_end_date", "value": {"end_date": PROPOSAL_END_DATE_AFTER_UPDATE}}),
69-
("condenser", ["update_proposal_end_date", {"end_date": PROPOSAL_END_DATE_AFTER_UPDATE}]),
69+
("condenser", [1, {"end_date": PROPOSAL_END_DATE_AFTER_UPDATE}]),
7070
],
7171
)
7272
@run_for("testnet")

‎tests/unit/plugin_tests/condenser_api_account_history_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ BOOST_AUTO_TEST_CASE( get_account_history_hf13 )
274274
R"~([1,{"trx_id":"47fae6df13c7117800ec407bafb1afc62f918cd3","block":3,"trx_in_block":0,"op_in_trx":1,"virtual_op":true,"timestamp":"2016-01-01T00:00:09","op":["account_created",{"new_account_name":"dan0ah","creator":"dan0ah","initial_vesting_shares":"0.000000 VESTS","initial_delegation":"0.000000 VESTS"}]}])~"
275275
#else
276276
R"~([0,{"trx_id":"ff3ec48842cf338b6a5905e817daea3cd12b0dd4","block":3,"trx_in_block":0,"op_in_trx":0,"virtual_op":false,"timestamp":"2016-01-01T00:00:09","op":{"type":"pow2_operation","value":{"work":{"type":"pow2","value":{"input":{"worker_account":"dan0ah","prev_block":"00000002a8c7664246009c0f84f09687dfb9ec55","nonce":8},"pow_summary":4211230234}},"new_owner_key":"STM7YJmUoKbPQkrMrZbrgPxDMYJA3uD3utaN3WYRwaFGKYbQ9ftKV","props":{"account_creation_fee":{"amount":"0","precision":3,"nai":"@@000000021"},"maximum_block_size":131072,"hbd_interest_rate":1000}}},"operation_id":0}])~",
277-
R"~([0,{"trx_id":"ff3ec48842cf338b6a5905e817daea3cd12b0dd4","block":3,"trx_in_block":0,"op_in_trx":0,"virtual_op":false,"timestamp":"2016-01-01T00:00:09","op":["pow2",{"work":["pow2",{"input":{"worker_account":"dan0ah","prev_block":"00000002a8c7664246009c0f84f09687dfb9ec55","nonce":8},"pow_summary":4211230234}],"new_owner_key":"STM7YJmUoKbPQkrMrZbrgPxDMYJA3uD3utaN3WYRwaFGKYbQ9ftKV","props":{"account_creation_fee":"0.000 TESTS","maximum_block_size":131072,"hbd_interest_rate":1000}}]}])~"
277+
R"~([0,{"trx_id":"ff3ec48842cf338b6a5905e817daea3cd12b0dd4","block":3,"trx_in_block":0,"op_in_trx":0,"virtual_op":false,"timestamp":"2016-01-01T00:00:09","op":["pow2",{"work":[0,{"input":{"worker_account":"dan0ah","prev_block":"00000002a8c7664246009c0f84f09687dfb9ec55","nonce":8},"pow_summary":4211230234}],"new_owner_key":"STM7YJmUoKbPQkrMrZbrgPxDMYJA3uD3utaN3WYRwaFGKYbQ9ftKV","props":{"account_creation_fee":"0.000 TESTS","maximum_block_size":131072,"hbd_interest_rate":1000}}]}])~"
278278
}, {
279279
R"~([1,{"trx_id":"ff3ec48842cf338b6a5905e817daea3cd12b0dd4","block":3,"trx_in_block":0,"op_in_trx":1,"virtual_op":true,"timestamp":"2016-01-01T00:00:09","op":{"type":"account_created_operation","value":{"new_account_name":"dan0ah","creator":"dan0ah","initial_vesting_shares":{"amount":"0","precision":6,"nai":"@@000000037"},"initial_delegation":{"amount":"0","precision":6,"nai":"@@000000037"}}},"operation_id":0}])~",
280280
R"~([1,{"trx_id":"ff3ec48842cf338b6a5905e817daea3cd12b0dd4","block":3,"trx_in_block":0,"op_in_trx":1,"virtual_op":true,"timestamp":"2016-01-01T00:00:09","op":["account_created",{"new_account_name":"dan0ah","creator":"dan0ah","initial_vesting_shares":"0.000000 VESTS","initial_delegation":"0.000000 VESTS"}]}])~"

‎tests/unit/plugin_tests/condenser_api_ops_in_block_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ BOOST_AUTO_TEST_CASE( get_ops_in_block_hf13 )
231231
R"~({"trx_id":"47fae6df13c7117800ec407bafb1afc62f918cd3","block":3,"trx_in_block":0,"op_in_trx":2,"virtual_op":true,"timestamp":"2016-01-01T00:00:09","op":["pow_reward",{"worker":"initminer","reward":"1000000.000000 VESTS"}]})~"
232232
#else
233233
R"~({"trx_id":"ff3ec48842cf338b6a5905e817daea3cd12b0dd4","block":3,"trx_in_block":0,"op_in_trx":0,"virtual_op":false,"timestamp":"2016-01-01T00:00:09","op":{"type":"pow2_operation","value":{"work":{"type":"pow2","value":{"input":{"worker_account":"dan0ah","prev_block":"00000002a8c7664246009c0f84f09687dfb9ec55","nonce":8},"pow_summary":4211230234}},"new_owner_key":"STM7YJmUoKbPQkrMrZbrgPxDMYJA3uD3utaN3WYRwaFGKYbQ9ftKV","props":{"account_creation_fee":{"amount":"0","precision":3,"nai":"@@000000021"},"maximum_block_size":131072,"hbd_interest_rate":1000}}},"operation_id":0})~",
234-
R"~({"trx_id":"ff3ec48842cf338b6a5905e817daea3cd12b0dd4","block":3,"trx_in_block":0,"op_in_trx":0,"virtual_op":false,"timestamp":"2016-01-01T00:00:09","op":["pow2",{"work":["pow2",{"input":{"worker_account":"dan0ah","prev_block":"00000002a8c7664246009c0f84f09687dfb9ec55","nonce":8},"pow_summary":4211230234}],"new_owner_key":"STM7YJmUoKbPQkrMrZbrgPxDMYJA3uD3utaN3WYRwaFGKYbQ9ftKV","props":{"account_creation_fee":"0.000 TESTS","maximum_block_size":131072,"hbd_interest_rate":1000}}]})~"
234+
R"~({"trx_id":"ff3ec48842cf338b6a5905e817daea3cd12b0dd4","block":3,"trx_in_block":0,"op_in_trx":0,"virtual_op":false,"timestamp":"2016-01-01T00:00:09","op":["pow2",{"work":[0,{"input":{"worker_account":"dan0ah","prev_block":"00000002a8c7664246009c0f84f09687dfb9ec55","nonce":8},"pow_summary":4211230234}],"new_owner_key":"STM7YJmUoKbPQkrMrZbrgPxDMYJA3uD3utaN3WYRwaFGKYbQ9ftKV","props":{"account_creation_fee":"0.000 TESTS","maximum_block_size":131072,"hbd_interest_rate":1000}}]})~"
235235
}, { // account_created_operation
236236
R"~({"trx_id":"ff3ec48842cf338b6a5905e817daea3cd12b0dd4","block":3,"trx_in_block":0,"op_in_trx":1,"virtual_op":true,"timestamp":"2016-01-01T00:00:09","op":{"type":"account_created_operation","value":{"new_account_name":"dan0ah","creator":"dan0ah","initial_vesting_shares":{"amount":"0","precision":6,"nai":"@@000000037"},"initial_delegation":{"amount":"0","precision":6,"nai":"@@000000037"}}},"operation_id":0})~",
237237
R"~({"trx_id":"ff3ec48842cf338b6a5905e817daea3cd12b0dd4","block":3,"trx_in_block":0,"op_in_trx":1,"virtual_op":true,"timestamp":"2016-01-01T00:00:09","op":["account_created",{"new_account_name":"dan0ah","creator":"dan0ah","initial_vesting_shares":"0.000000 VESTS","initial_delegation":"0.000000 VESTS"}]})~"

0 commit comments

Comments
 (0)