Remove HF 572

bitshares · Jul 9, 2019 · 718098c · 718098c
1 parent fc02888
commit 718098c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/libraries/chain/asset_evaluator.cpp b/libraries/chain/asset_evaluator.cpp
@@ -267,7 +267,7 @@ void_result asset_update_evaluator::do_evaluate(const asset_update_operation& o)
       validate_new_issuer( d, a, *o.new_issuer );
    }
 
-   if( (d.head_block_time() < HARDFORK_572_TIME) || (a.dynamic_asset_data_id(d).current_supply != 0) )
+   if( a.dynamic_asset_data_id(d).current_supply != 0 )
    {
       // new issuer_permissions must be subset of old issuer permissions
       FC_ASSERT(!(o.new_options.issuer_permissions & ~a.options.issuer_permissions),

diff --git a/libraries/chain/hardfork.d/572.hf b/libraries/chain/hardfork.d/572.hf
diff --git a/tests/tests/fee_tests.cpp b/tests/tests/fee_tests.cpp
@@ -3425,7 +3425,6 @@ BOOST_AUTO_TEST_CASE( stealth_fba_test )
 
       generate_blocks( HARDFORK_555_TIME );
       generate_blocks( HARDFORK_563_TIME );
-      generate_blocks( HARDFORK_572_TIME );
 
       // Philbin (registrar who registers Rex)
 

diff --git a/tests/tests/operation_tests.cpp b/tests/tests/operation_tests.cpp
@@ -1211,7 +1211,14 @@ BOOST_AUTO_TEST_CASE( update_uia )
          PUSH_TX( db, trx, ~0 );
       }
 
-      BOOST_TEST_MESSAGE( "Make sure white_list can't be re-enabled" );
+      asset_issue_operation issue_op;
+      issue_op.issuer = op.issuer;
+      issue_op.asset_to_issue =  asset(5000000,op.asset_to_update);
+      issue_op.issue_to_account = nathan.get_id();
+      trx.operations.push_back(issue_op);
+      PUSH_TX(db, trx, ~0);
+
+      BOOST_TEST_MESSAGE( "Make sure white_list can't be re-enabled (after tokens issued)" );
       op.new_options.issuer_permissions = test.options.issuer_permissions;
       op.new_options.flags = test.options.flags;
       BOOST_CHECK(!(test.options.issuer_permissions & white_list));