Clean up hardfork code #1718

jmjatlanta · 2019-04-12T13:53:19Z

There are some hardfork dates that have long passed, and the alternate logic never was used. This PR removes those unnecessary sections.

All hardfork code prior to v3.0.0 was reviewed. The code that remains is believed to be necessary, and was untouched.

Snapshots were done on testnet and mainnet to assure that the results are the same.

abitmore · 2019-04-12T18:12:18Z

Note: we may probably need to keep some of those in testnet branch.

jmjatlanta · 2019-04-12T18:22:28Z

Note: we may probably need to keep some of those in testnet branch.

I started testing by running snapshots against testnet. It was a while ago (mid-march). I will test again. If the snapshot comes out equal, is there something else that must be considered?

abitmore · 2019-04-12T19:53:05Z

The code that remains is believed to be necessary, and was untouched.

Please remove the TODO here:

bitshares-core/libraries/chain/market_evaluator.cpp

Line 333 in 0a9d223

    
           if( d.head_block_time() <= HARDFORK_CORE_583_TIME ) // TODO remove after hard fork core-583

or perhaps better replace it with a comment explaining why. I don't remember if there is another comment (or more) that need to be corrected.

I think this code can be removed:

bitshares-core/libraries/chain/market_evaluator.cpp

Lines 164 to 167 in 0a9d223

    
           // TODO: remove this check and the assertion after hf_834 
        
           if( next_maintenance_time <= HARDFORK_CORE_834_TIME ) 
        
              FC_ASSERT( !o.extensions.value.target_collateral_ratio.valid(), 
        
                         "Can not set target_collateral_ratio in call_order_update_operation before hardfork 834." );

I started testing by running snapshots against testnet. It was a while ago (mid-march). I will test again. If the snapshot comes out equal, is there something else that must be considered?

I don't remember anything else..

abitmore · 2019-04-12T19:59:02Z

HF 834
HF 199
HF 583 (can't remove, need to update comments in code)

pmconrad · 2019-04-16T06:22:36Z

chain_test failed in travis

jmjatlanta · 2019-04-16T14:55:00Z

I am working on the issues found, and re-running the snapshot comparisons on testnet and mainnet. I will reply here when those modifications and tests are complete.

Note: the commit da6337d "removal of hf834" has an incorrect commit message. Some (not all) HF code was removed. Some has to stay.

pmconrad · 2019-04-17T13:44:40Z

chain_test still failing

jmjatlanta · 2019-04-17T16:48:27Z

I believe I have handled all the previously found issues with this PR. Please review.

Re-ran snapshots for testnet and mainnet with no differences.

libraries/chain/account_evaluator.cpp

libraries/chain/asset_evaluator.cpp

pmconrad · 2019-04-25T13:20:46Z

libraries/chain/market_evaluator.cpp

-   if( next_maintenance_time <= HARDFORK_CORE_834_TIME )
-      FC_ASSERT( !o.extensions.value.target_collateral_ratio.valid(),
-                 "Can not set target_collateral_ratio in call_order_update_operation before hardfork 834." );
-
   _paying_account = &o.funding_account(d);
   _debt_asset     = &o.delta_debt.asset_id(d);
   FC_ASSERT( _debt_asset->is_market_issued(), "Unable to cover ${sym} as it is not a collateralized asset.",


Please update the comment in lines 172-176.

Updated comment about softfork 1465 as part of #1743
Update more work needed on this one.

libraries/chain/db_market.cpp

pmconrad · 2019-04-25T13:23:04Z

libraries/chain/db_market.cpp

@@ -641,25 +641,16 @@ int database::match( const limit_order_object& bid, const call_order_object& ask
   // TODO remove when we're sure it's always false


Please update this comment to indicate why we're sure it's not always false.

pmconrad · 2019-04-25T13:24:57Z

libraries/chain/proposal_evaluator.cpp

@@ -56,21 +56,9 @@ struct proposal_operation_hardfork_visitor
            || (v.delta_debt.asset_id( db ).bitasset_data_id


Please replace the TODO comment in line 51

pmconrad · 2019-04-25T13:27:48Z

libraries/chain/proposal_evaluator.cpp

-      if (block_time < HARDFORK_CORE_188_TIME) {
-         FC_ASSERT(false, "Not allowed until hardfork 188");
-      }
-   }
   // hf_588
   // issue #588
   //


Please update the rest of this comment to indicate why this can't be moved into asset_settle_cancel_operation::validate as suggested.

The HARDFORK_CORE_1468 checks should be removed as well I think.

pmconrad · 2019-04-29T13:37:53Z

As discussed on telegram we'll merge what we have for the upcoming release and create another cleanup PR later that will address the remaining comments.

jmjatlanta added 11 commits February 22, 2019 12:24

Remove unused .hf files

38d5d41

Removal of hardfork 23

39b768e

Removal of hf 413

bea8ca0

Removal of hf 415

cc3e519

Removal of hf 419

1c50372

Removal of hf 538

bc9f1d9

Removal of hf 599

06e66be

Removal of hf 188

b20ff25

Removal of hf 620

a91f470

Removal of hf 942

ac14e34

Fix conflict with hf1268 and removal of hf620

0a9d223

abitmore added this to the 3.1.0 - Feature Release milestone Apr 12, 2019

Cleanup of some (not all) hf_199

28a0d08

jmjatlanta added 2 commits April 16, 2019 05:46

removal of hf834

da6337d

Fix comment for hf583

db2795d

Fix unit test for HF199

b766f94

fixed test for HF834

cf476df

pmconrad suggested changes Apr 25, 2019

View reviewed changes

pmconrad approved these changes Apr 29, 2019

View reviewed changes

jmjatlanta merged commit 7ad8447 into develop Apr 29, 2019

jmjatlanta deleted the jmj_1553b branch April 29, 2019 20:07

jmjatlanta mentioned this pull request Apr 29, 2019

Hardfork cleanup of 3.0.1 and prior #1743

Closed

17 tasks

MichelSantos mentioned this pull request May 1, 2019

Release Notes: BitShares Core 3.1.0 #1745

Closed

jmjatlanta mentioned this pull request May 10, 2019

remove old hardfork checks #1553

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Clean up hardfork code #1718

Clean up hardfork code #1718

jmjatlanta commented Apr 12, 2019 •

edited

Loading

abitmore commented Apr 12, 2019

jmjatlanta commented Apr 12, 2019

abitmore commented Apr 12, 2019 •

edited

Loading

abitmore commented Apr 12, 2019 •

edited by jmjatlanta

Loading

pmconrad commented Apr 16, 2019

jmjatlanta commented Apr 16, 2019 •

edited

Loading

pmconrad commented Apr 17, 2019

jmjatlanta commented Apr 17, 2019 •

edited

Loading

pmconrad Apr 25, 2019

jmjatlanta May 2, 2019 •

edited

Loading

pmconrad Apr 25, 2019

pmconrad Apr 25, 2019

pmconrad Apr 25, 2019

pmconrad Apr 25, 2019

pmconrad commented Apr 29, 2019

		@@ -641,25 +641,16 @@ int database::match( const limit_order_object& bid, const call_order_object& ask
		// TODO remove when we're sure it's always false

		@@ -56,21 +56,9 @@ struct proposal_operation_hardfork_visitor
		\|\| (v.delta_debt.asset_id( db ).bitasset_data_id

Clean up hardfork code #1718

Clean up hardfork code #1718

Conversation

jmjatlanta commented Apr 12, 2019 • edited Loading

abitmore commented Apr 12, 2019

jmjatlanta commented Apr 12, 2019

abitmore commented Apr 12, 2019 • edited Loading

abitmore commented Apr 12, 2019 • edited by jmjatlanta Loading

pmconrad commented Apr 16, 2019

jmjatlanta commented Apr 16, 2019 • edited Loading

pmconrad commented Apr 17, 2019

jmjatlanta commented Apr 17, 2019 • edited Loading

pmconrad Apr 25, 2019

Choose a reason for hiding this comment

jmjatlanta May 2, 2019 • edited Loading

Choose a reason for hiding this comment

pmconrad Apr 25, 2019

Choose a reason for hiding this comment

pmconrad Apr 25, 2019

Choose a reason for hiding this comment

pmconrad Apr 25, 2019

Choose a reason for hiding this comment

pmconrad Apr 25, 2019

Choose a reason for hiding this comment

pmconrad commented Apr 29, 2019

jmjatlanta commented Apr 12, 2019 •

edited

Loading

abitmore commented Apr 12, 2019 •

edited

Loading

abitmore commented Apr 12, 2019 •

edited by jmjatlanta

Loading

jmjatlanta commented Apr 16, 2019 •

edited

Loading

jmjatlanta commented Apr 17, 2019 •

edited

Loading

jmjatlanta May 2, 2019 •

edited

Loading