Update compile-time constants #510

CMakeLists.txt

@@ -49,8 +49,6 @@ LIST(APPEND BOOST_COMPONENTS thread
                              locale)
 SET( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
 
-OPTION( ENABLE_CONTENT_PATCHING "Allow posts to be updated with a patch rather than replaced, Requires Qt5" ON )
-
 OPTION( BUILD_STEEM_TESTNET "Build source for test network (ON OR OFF)" OFF )
 MESSAGE( STATUS "BUILD_STEEM_TESTNET: ${BUILD_STEEM_TESTNET}" )
 if( BUILD_STEEM_TESTNET  )

Dockerfile

@@ -36,8 +36,8 @@ RUN \
         -DCMAKE_INSTALL_PREFIX=/usr/local/steemd-default \
         -DCMAKE_BUILD_TYPE=Release \
         -DLOW_MEMORY_NODE=ON \
-        -DENABLE_CONTENT_PATCHING=OFF \
         -DCLEAR_VOTES=ON \
+        -DBUILD_STEEM_TESTNET=OFF \
         .. \
     && \
     make -j$(nproc) && \
@@ -50,8 +50,8 @@ RUN \
         -DCMAKE_INSTALL_PREFIX=/usr/local/steemd-full \
         -DCMAKE_BUILD_TYPE=Release \
         -DLOW_MEMORY_NODE=OFF \
-        -DENABLE_CONTENT_PATCHING=ON \
         -DCLEAR_VOTES=OFF \
+        -DBUILD_STEEM_TESTNET=OFF \
         .. \
     && \
     make -j$(nproc) && \

doc/building.md

@@ -10,24 +10,17 @@ running tests, it is recommended to build as release.
 
 ### LOW_MEMORY_NODE=[OFF/ON]
 
-Builds steemd to be a consensus only low memory node. Data and fields not
+Builds steemd to be a consensus-only low memory node. Data and fields not
 needed for consensus are not stored in the object database.  This option is
 recommended for witnesses and seed-nodes.
 
-### ENABLE_CONTENT_PATCHING=[ON/OFF]
-
-Allows content to be updated using a patch rather than a complete
-replacement.  If you do not need an API server or need to see the result of
-patching content then you can set this to OFF.
-
 ### CLEAR_VOTES=[ON/OFF]
 
-Clears old votes from memory that are not longer required for consensus.
+Clears old votes from memory that are no longer required for consensus.
 
 ### BUILD_STEEM_TESTNET=[OFF/ON]
 
-Builds steem for use in a private testnet. Also required for correctly
-building unit tests
+Builds steem for use in a private testnet. Also required for building unit tests.
 
 ## Building under Docker
 
@@ -117,12 +110,10 @@ Steem requires Boost 1.57 or later. The Boost provided in the Ubuntu 14.04
 package manager (Boost 1.55) is too old. So building Steem on Ubuntu 14.04
 requires downloading and installing a more recent version of Boost.
 
-<!-- FIXME is the 16.04 below correct? should it read 14.04? -->
-
 According to [this mailing list
 post](http://boost.2283326.n4.nabble.com/1-58-1-bugfix-release-necessary-td4674686.html),
 Boost 1.58 is not compatible with gcc 4.8 (the default C++ compiler for
-Ubuntu 16.04) when compiling in C++11 mode (which Steem does). So we will
+Ubuntu 14.04) when compiling in C++11 mode (which Steem does). So we will
 use Boost 1.57; if you try to build with any other version, you will
 probably have a bad time.
 

libraries/chain/database.cpp

@@ -2206,7 +2206,7 @@ asset database::get_pow_reward()const
 {
    const auto& props = get_dynamic_global_properties();
 
-#if !IS_TEST_NET
+#ifndef IS_TEST_NET
    /// 0 block rewards until at least STEEMIT_MAX_MINERS have produced a POW
    if( props.num_pow_witnesses < STEEMIT_MAX_MINERS && props.head_block_number < STEEMIT_START_VESTING_BLOCK )
       return asset( 0, STEEM_SYMBOL );

libraries/chain/steem_evaluator.cpp

@@ -156,7 +156,7 @@ void account_update_evaluator::do_apply( const account_update_operation& o )
 
    if( o.owner )
    {
-#ifndef IS_TESTNET
+#ifndef IS_TEST_NET
       if( db().has_hardfork( STEEMIT_HARDFORK_0_11 ) )
          FC_ASSERT( db().head_block_time() - account.last_owner_update > STEEMIT_OWNER_UPDATE_LIMIT, "can only update owner authority once a minute" );
 #endif