#387 - fix hardfork checks

peerplays-network · Jun 14, 2022 · 4cdb79f · 4cdb79f
1 parent cf1e42a
commit 4cdb79f
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/libraries/chain/db_maint.cpp b/libraries/chain/db_maint.cpp
@@ -197,7 +197,7 @@ void database::pay_sons()
          }
       }
       const vector<std::reference_wrapper<const son_object>> sons = [this, &son_count]{
-         if( (head_block_time() >= HARDFORK_SON2_TIME) && (head_block_time() < HARDFORK_SON3_TIME) )
+         if(head_block_time() >= HARDFORK_SON3_TIME)
             return sort_votable_objects<son_index>(std::max(son_count*2+1, (size_t)get_chain_properties().immutable_parameters.min_son_count));
          else
             return sort_votable_objects<son_index>(get_global_properties().parameters.maximum_son_count());
@@ -699,7 +699,7 @@ void database::update_active_sons()
 
    const global_property_object& gpo = get_global_properties();
    const vector<std::reference_wrapper<const son_object>> sons = [this, &son_count]{
-      if( (head_block_time() >= HARDFORK_SON2_TIME) && (head_block_time() < HARDFORK_SON3_TIME) )
+      if(head_block_time() >= HARDFORK_SON3_TIME)
          return sort_votable_objects<son_index>(std::max(son_count*2+1, (size_t)get_chain_properties().immutable_parameters.min_son_count));
       else
          return sort_votable_objects<son_index>(get_global_properties().parameters.maximum_son_count());
@@ -2064,13 +2064,6 @@ void update_son_params(database& db)
          gpo.parameters.extensions.value.maximum_son_count = 7;
       });
    }
-   else
-   {
-      const auto& gpo = db.get_global_properties();
-      db.modify( gpo, []( global_property_object& gpo ) {
-         gpo.parameters.extensions.value.maximum_son_count = GRAPHENE_DEFAULT_MAX_SONS;
-      });
-   }
 }
 
 void database::perform_chain_maintenance(const signed_block& next_block, const global_property_object& global_props)