Minimuze implementation for (future rc delegation code is commented o…

…ut temporarily) #2705

libraries/chain/steem_evaluator.cpp

@@ -2211,8 +2211,6 @@ void custom_json_evaluator::do_apply( const custom_json_operation& o )
 {
    database& d = db();
 
-   ilog( "custom_json_evaluator   is_producing = ${p}    operation = ${o}", ("p", d.is_producing())("o", o) );
-
    if( d.is_producing() )
       FC_ASSERT( o.json.length() <= STEEM_CUSTOM_OP_DATA_MAX_LENGTH,
          "Operation JSON must be less than ${bytes} bytes.", ("bytes", STEEM_CUSTOM_OP_DATA_MAX_LENGTH) );
@@ -2227,7 +2225,6 @@ void custom_json_evaluator::do_apply( const custom_json_operation& o )
    std::shared_ptr< custom_operation_interpreter > eval = d.get_custom_json_evaluator( o.id );
    if( !eval )
    {
-      ilog( "Accepting, no evaluator registered" );
       return;
    }
 
@@ -2239,10 +2236,8 @@ void custom_json_evaluator::do_apply( const custom_json_operation& o )
    {
       if( d.is_producing() )
       {
-         ilog( "Re-throwing exception ${e}", ("e", e) );
          throw e;
       }
-      ilog( "Suppressing exception ${e}", ("e", e) );
    }
    catch(...)
    {

libraries/plugins/rc/include/steem/plugins/rc/rc_operations.hpp

@@ -50,6 +50,7 @@ struct delegate_to_pool_operation : steem::protocol::base_operation
  * - When increasing delegation, new DRC is always created to fill the new manabar section.
  * - When removing delegation, DRC may be destroyed, but only to the extent necessary for the account not to exceed its newly reduced maximum.
  */
+/*
 struct delegate_drc_from_pool_operation : steem::protocol::base_operation
 {
    account_name_type      from_pool;
@@ -63,6 +64,7 @@ struct delegate_drc_from_pool_operation : steem::protocol::base_operation
    void validate()const;
    void get_required_active_authorities( flat_set<account_name_type>& a )const { a.insert( from_pool ); }
 };
+*/
 
 /**
  * The purpose of set_slot_delegator_operation is to set the delegator allowed to delegate to a
@@ -73,6 +75,7 @@ struct delegate_drc_from_pool_operation : steem::protocol::base_operation
  * the existing delegator, the account itself, or (in the case of slot 1, STEEM_RC_RECOVERY_SLOT_NUM)
  * the slot may also be set by the account's recovery partner.
  */
+/*
 struct set_slot_delegator_operation : steem::protocol::base_operation
 {
    account_name_type      from_pool;
@@ -85,16 +88,17 @@ struct set_slot_delegator_operation : steem::protocol::base_operation
    void validate()const;
    void get_required_active_authorities( flat_set<account_name_type>& a )const { a.insert( signer ); }
 };
+*/
 
 typedef fc::static_variant<
-         delegate_to_pool_operation,
-         delegate_drc_from_pool_operation,
-         set_slot_delegator_operation
+         delegate_to_pool_operation
+         //delegate_drc_from_pool_operation,
+         //set_slot_delegator_operation
       > rc_plugin_operation;
 
 STEEM_DEFINE_PLUGIN_EVALUATOR( rc_plugin, rc_plugin_operation, delegate_to_pool );
-STEEM_DEFINE_PLUGIN_EVALUATOR( rc_plugin, rc_plugin_operation, delegate_drc_from_pool );
-STEEM_DEFINE_PLUGIN_EVALUATOR( rc_plugin, rc_plugin_operation, set_slot_delegator );
+//STEEM_DEFINE_PLUGIN_EVALUATOR( rc_plugin, rc_plugin_operation, delegate_drc_from_pool );
+//STEEM_DEFINE_PLUGIN_EVALUATOR( rc_plugin, rc_plugin_operation, set_slot_delegator );
 
 } } } // steem::plugins::rc
 
@@ -104,6 +108,7 @@ FC_REFLECT( steem::plugins::rc::delegate_to_pool_operation,
    (amount)
    (extensions)
    )
+/*
 FC_REFLECT( steem::plugins::rc::delegate_drc_from_pool_operation,
    (from_pool)
    (to_account)
@@ -119,6 +124,6 @@ FC_REFLECT( steem::plugins::rc::set_slot_delegator_operation,
    (signer)
    (extensions)
    )
-
+*/
 STEEM_DECLARE_OPERATION_TYPE( steem::plugins::rc::rc_plugin_operation )
 FC_REFLECT_TYPENAME( steem::plugins::rc::rc_plugin_operation )

libraries/plugins/rc/rc_operations.cpp

@@ -25,7 +25,7 @@ void delegate_to_pool_operation::validate()const
    FC_ASSERT( amount.symbol == VESTS_SYMBOL, "Currently can only delegate VESTS (SMT's not supported #2698)" );
    FC_ASSERT( amount.amount.value >= 0, "Delegation to pool cannot be negative" );
 }
-
+/*
 void delegate_drc_from_pool_operation::validate()const
 {
    validate_account_name( from_pool );
@@ -47,6 +47,7 @@ void set_slot_delegator_operation::validate()const
    FC_ASSERT( to_slot >= 0 );
    FC_ASSERT( to_slot < STEEM_RC_MAX_OUTDEL_SLOTS );
 }
+*/
 
 void delegate_to_pool_evaluator::do_apply( const delegate_to_pool_operation& op )
 {
@@ -148,7 +149,7 @@ void delegate_to_pool_evaluator::do_apply( const delegate_to_pool_operation& op
          rca.vests_delegated_to_pools += asset( delta_max_rc, VESTS_SYMBOL );
    } );
 }
-
+/*
 void delegate_drc_from_pool_evaluator::do_apply( const delegate_drc_from_pool_operation& op )
 {
    FC_ASSERT( false, "Operation not yet supported" );
@@ -158,6 +159,7 @@ void set_slot_delegator_evaluator::do_apply( const set_slot_delegator_operation&
 {
    FC_ASSERT( false, "Operation not yet supported" );
 }
+*/
 
 } } } // steem::plugins::rc
 

libraries/plugins/rc/rc_plugin.cpp

@@ -797,7 +797,7 @@ struct pre_apply_operation_visitor
 
    void operator()( const delegate_to_pool_operation& op )const
    {
-      ilog( "Regenerating ${acct}", ("acct", op.from_account) );
+      //ilog( "Regenerating ${acct}", ("acct", op.from_account) );
       regenerate( op.from_account );
    }
 
@@ -1302,8 +1302,8 @@ void rc_plugin::plugin_initialize( const boost::program_options::variables_map&
 
       // Add each operation evaluator to the registry
       my->_custom_operation_interpreter->register_evaluator< delegate_to_pool_evaluator >( this );
-      my->_custom_operation_interpreter->register_evaluator< delegate_drc_from_pool_evaluator >( this );
-      my->_custom_operation_interpreter->register_evaluator< set_slot_delegator_evaluator >( this );
+      //my->_custom_operation_interpreter->register_evaluator< delegate_drc_from_pool_evaluator >( this );
+      //my->_custom_operation_interpreter->register_evaluator< set_slot_delegator_evaluator >( this );
 
       // Add the registry to the database so the database can delegate custom ops to the plugin
       my->_db.register_custom_operation_interpreter( my->_custom_operation_interpreter );