Merge pull request #977 from bitshares/release

Merge release branch into testnet branch

Author: abitmore

tests/tests/bitasset_tests.cpp

@@ -1036,13 +1036,15 @@ BOOST_AUTO_TEST_CASE( hf_935_test )
          ba_op.issuer = asset_to_update.issuer;
          ba_op.new_options = asset_to_update.bitasset_data(db).options;
          ba_op.new_options.feed_lifetime_sec = HARDFORK_CORE_935_TIME.sec_since_epoch()
-                                             - db.head_block_time().sec_since_epoch()
-                                             + mi * 3;
+                                             + mi * 3 + 86400 * 2
+                                             - db.head_block_time().sec_since_epoch();
          trx.operations.push_back(ba_op);
          PUSH_TX(db, trx, ~0);
          trx.clear();
       }
 
+      bool affected_by_hf_343 = false;
+
       // check
       if( i / 2 == 0 ) // before hard fork 890
       {
@@ -1054,8 +1056,14 @@ BOOST_AUTO_TEST_CASE( hf_935_test )
          BOOST_CHECK( db.find<limit_order_object>( sell_id ) );
 
          // go beyond hard fork 890
-         blocks += generate_blocks(HARDFORK_CORE_868_890_TIME - mi, true, skip);
-         blocks += generate_blocks(db.get_dynamic_global_properties().next_maintenance_time, true, skip);
+         blocks += generate_blocks( HARDFORK_CORE_868_890_TIME - mi, true, skip );
+         bool was_before_hf_343 = ( db.get_dynamic_global_properties().next_maintenance_time <= HARDFORK_CORE_343_TIME );
+
+         blocks += generate_blocks( db.get_dynamic_global_properties().next_maintenance_time, true, skip );
+         bool now_after_hf_343 = ( db.get_dynamic_global_properties().next_maintenance_time > HARDFORK_CORE_343_TIME );
+
+         if( was_before_hf_343 && now_after_hf_343 ) // if hf 343 executed at same maintenance interval, actually after hf 890
+            affected_by_hf_343 = true;
       }
 
       // after hard fork 890, if it's before hard fork 935
@@ -1067,8 +1075,13 @@ BOOST_AUTO_TEST_CASE( hf_935_test )
             BOOST_CHECK_EQUAL( usd_id(db).bitasset_data(db).current_feed.maintenance_collateral_ratio, 3500 );
          else // MSSR test, MSSR should be 125%
             BOOST_CHECK_EQUAL( usd_id(db).bitasset_data(db).current_feed.maximum_short_squeeze_ratio, 1250 );
-         // but the limit order is still there, because `check_call_order` was incorrectly skipped
-         BOOST_CHECK( db.find<limit_order_object>( sell_id ) );
+
+         if( affected_by_hf_343 ) // if updated bitasset before hf 890, and hf 343 executed after hf 890
+            // the limit order should have been filled
+            BOOST_CHECK( !db.find<limit_order_object>( sell_id ) );
+         else // if not affected by hf 343
+            // the limit order should be still there, because `check_call_order` was incorrectly skipped
+            BOOST_CHECK( db.find<limit_order_object>( sell_id ) );
 
          // go beyond hard fork 935
          blocks += generate_blocks(HARDFORK_CORE_935_TIME - mi, true, skip);