Merge branch 'develop' into is-virtual-field-in-es

bitshares · Mar 20, 2023 · d226bd9 · d226bd9
2 parents bfa0401 + d50e2db
commit d226bd9
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 10 deletions.
diff --git a/.github/workflows/build-and-test.mac.yml b/.github/workflows/build-and-test.mac.yml
@@ -45,6 +45,7 @@ jobs:
         make -j 3 -C _build witness_node cli_wallet app_test cli_test chain_test
         df -h
     - name: Unit-Tests
+      timeout-minutes: 15
       run: |
         _build/tests/app_test -l test_suite
         libraries/fc/tests/run-parallel-tests.sh _build/tests/chain_test -l test_suite

diff --git a/.github/workflows/build-and-test.ubuntu-debug.yml b/.github/workflows/build-and-test.ubuntu-debug.yml
@@ -110,6 +110,7 @@ jobs:
         du -hs _build/*
         du -hs /_build/*
     - name: Unit-Tests
+      timeout-minutes: 15
       run: |
         _build/tests/app_test -l test_suite
         df -h

diff --git a/.github/workflows/build-and-test.ubuntu-release.yml b/.github/workflows/build-and-test.ubuntu-release.yml
@@ -87,6 +87,7 @@ jobs:
         make -j 2 -C _build
         df -h
     - name: Unit-Tests
+      timeout-minutes: 15
       run: |
         _build/tests/app_test -l test_suite
         _build/tests/es_test -l test_suite

diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml
@@ -164,6 +164,7 @@ jobs:
         rm -rf _build/programs/genesis_util/get_dev_key
         df -h
     - name: Unit-Tests
+      timeout-minutes: 15
       run: |
         _build/tests/app_test -l test_suite
         df -h

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2015-2022 Cryptonomex Inc. <[email protected]> and
+Copyright (c) 2015-2023 Cryptonomex Inc. <[email protected]> and
 contributors (see CONTRIBUTORS.txt)
 
 The MIT License

diff --git a/libraries/chain/db_market.cpp b/libraries/chain/db_market.cpp
@@ -593,7 +593,10 @@ void database::cancel_limit_order( const limit_order_object& order, bool create_
    }
 
    if( create_virtual_op )
-      push_applied_operation( vop );
+   {
+      auto op_id = push_applied_operation( vop );
+      set_applied_operation_result( op_id, refunded );
+   }
 
    remove(order);
 }

diff --git a/libraries/chain/include/graphene/chain/config.hpp b/libraries/chain/include/graphene/chain/config.hpp
@@ -32,7 +32,7 @@
 
 #define GRAPHENE_MAX_NESTED_OBJECTS (200)
 
-const std::string GRAPHENE_CURRENT_DB_VERSION = "20220930";
+const std::string GRAPHENE_CURRENT_DB_VERSION = "20230319";
 
 #define GRAPHENE_RECENTLY_MISSED_COUNT_INCREMENT             4
 #define GRAPHENE_RECENTLY_MISSED_COUNT_DECREMENT             3

diff --git a/tests/tests/history_api_tests.cpp b/tests/tests/history_api_tests.cpp
@@ -138,8 +138,8 @@ BOOST_AUTO_TEST_CASE(get_account_history) {
    }
 }
 
-BOOST_AUTO_TEST_CASE(get_account_history_virtual_operation_test) {
-   try {
+BOOST_AUTO_TEST_CASE(get_account_history_virtual_operation_test)
+{ try {
       graphene::app::history_api hist_api(app);
 
       asset_id_type usd_id = create_user_issued_asset("USD").get_id();
@@ -164,11 +164,38 @@ BOOST_AUTO_TEST_CASE(get_account_history_virtual_operation_test) {
       BOOST_CHECK( histories.front().block_time == db.head_block_time() );
       BOOST_CHECK( histories.front().is_virtual );
 
-   } catch (fc::exception &e) {
-      edump((e.to_detail_string()));
-      throw;
-   }
-}
+      // Create a limit order that expires in 300 seconds
+      create_sell_order( dan_id, asset(10, usd_id), asset(10), db.head_block_time() + 300 );
+
+      generate_block();
+      fc::usleep(fc::milliseconds(100));
+
+      auto order_create_op_id = operation::tag<limit_order_create_operation>::value;
+
+      histories = hist_api.get_account_history("dan", operation_history_id_type(),
+                                                      100, operation_history_id_type());
+
+      BOOST_REQUIRE_GT( histories.size(), 0 );
+      BOOST_CHECK_EQUAL( histories.front().op.which(), order_create_op_id );
+      BOOST_CHECK( histories.front().block_time == db.head_block_time() );
+      BOOST_CHECK( !histories.front().is_virtual );
+
+      // Let the limit order expire
+      generate_blocks( db.head_block_time() + 300 );
+      generate_block();
+      fc::usleep(fc::milliseconds(100));
+
+      auto order_cancel_op_id = operation::tag<limit_order_cancel_operation>::value;
+
+      histories = hist_api.get_account_history("dan", operation_history_id_type(),
+                                                      100, operation_history_id_type());
+
+      BOOST_REQUIRE_GT( histories.size(), 0 );
+      BOOST_CHECK_EQUAL( histories.front().op.which(), order_cancel_op_id );
+      BOOST_CHECK( histories.front().is_virtual );
+      BOOST_CHECK( histories.front().result.is_type<asset>() );
+
+} FC_LOG_AND_RETHROW() }
 
 BOOST_AUTO_TEST_CASE(get_account_history_notify_all_on_creation) {
    try {