Fix some STEEMIT_MIN_BLOCK_SIZE_LIMIT constants steemit#179

gdseller · Jul 20, 2016 · f3399b9 · f3399b9
1 parent 9e14ae1
commit f3399b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/libraries/chain/steem_evaluator.cpp b/libraries/chain/steem_evaluator.cpp
@@ -57,7 +57,7 @@ void witness_update_evaluator::do_apply( const witness_update_operation& o )
    if ( db().has_hardfork( STEEMIT_HARDFORK_0_1 ) ) FC_ASSERT( o.url.size() <= STEEMIT_MAX_WITNESS_URL_LENGTH );
 
    if( !db().has_hardfork( STEEMIT_HARDFORK_0_12__179) )
-      FC_ASSERT( o.props.maximum_block_size >= STEEMIT_MIN_BLOCK_SIZE_LIMIT );
+      FC_ASSERT( o.props.maximum_block_size >= STEEMIT_MIN_BLOCK_SIZE_LIMIT * 2 );
 
    const auto& by_witness_name_idx = db().get_index_type< witness_index >().indices().get< by_name >();
    auto wit_itr = by_witness_name_idx.find( o.owner );

diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp
@@ -145,7 +145,7 @@ void witness_plugin::plugin_initialize(const boost::program_options::variables_m
    {
       const uint32_t maximum_block_size = options["miner-maximum-block-size"].as<uint32_t>();
 
-      if( maximum_block_size < STEEMIT_MIN_BLOCK_SIZE_LIMIT * 2 ) // TODO: Remove * 2 after hardfork 12
+      if( maximum_block_size < STEEMIT_MIN_BLOCK_SIZE_LIMIT )
          wlog( "miner-maximum-block-size is below the minimum block size limit, using default of 128 KB instead" );
       else if ( maximum_block_size > STEEMIT_MAX_BLOCK_SIZE )
       {