Merge branch 'develop' into testnet_release

bitshares · Nov 5, 2017 · 147c14e · 147c14e
2 parents 66a38dd + 3a9474b
commit 147c14e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/libraries/chain/account_evaluator.cpp b/libraries/chain/account_evaluator.cpp
@@ -210,6 +210,7 @@ object_id_type account_create_evaluator::do_apply( const account_create_operatio
          }
    });
 
+   /*
    if( has_small_percent )
    {
       wlog( "Account affected by #453 registered in block ${n}:  ${na} reg=${reg} ref=${ref}:${refp} ltr=${ltr}:${ltrp}",
@@ -218,6 +219,7 @@ object_id_type account_create_evaluator::do_apply( const account_create_operatio
          ("refp", new_acnt_object.referrer_rewards_percentage) ("ltrp", new_acnt_object.lifetime_referrer_fee_percentage) );
       wlog( "Affected account object is ${o}", ("o", new_acnt_object) );
    }
+   */
 
    const auto& dynamic_properties = db().get_dynamic_global_properties();
    db().modify(dynamic_properties, [](dynamic_global_property_object& p) {

diff --git a/libraries/chain/db_market.cpp b/libraries/chain/db_market.cpp
@@ -571,12 +571,14 @@ bool database::check_call_orders(const asset_object& mia, bool enable_black_swan
        if( match_price > ~call_itr->call_price )
           return margin_called;
 
+       /*
        if( feed_protected )
        {
           ilog( "Feed protected margin call executing (HARDFORK_436_TIME not here yet)" );
           idump( (*call_itr) );
           idump( (*limit_itr) );
        }
+       */
 
      //  idump((*call_itr));
      //  idump((*limit_itr));

diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp
@@ -272,7 +272,7 @@ void database::clear_expired_orders()
             if( canceler.fee.amount > order.deferred_fee )
             {
                // Cap auto-cancel fees at deferred_fee; see #549
-               wlog( "At block ${b}, fee for clearing expired order ${oid} was capped at deferred_fee ${fee}", ("b", head_block_num())("oid", order.id)("fee", order.deferred_fee) );
+               //wlog( "At block ${b}, fee for clearing expired order ${oid} was capped at deferred_fee ${fee}", ("b", head_block_num())("oid", order.id)("fee", order.deferred_fee) );
                canceler.fee = asset( order.deferred_fee, asset_id_type() );
             }
             // we know the fee for this op is set correctly since it is set by the chain.

diff --git a/libraries/plugins/debug_witness/debug_witness.cpp b/libraries/plugins/debug_witness/debug_witness.cpp
@@ -47,7 +47,7 @@ void debug_witness_plugin::plugin_set_program_options(
 {
    auto default_priv_key = fc::ecc::private_key::regenerate(fc::sha256::hash(std::string("nathan")));
    command_line_options.add_options()
-         ("private-key", bpo::value<vector<string>>()->composing()->multitoken()->
+         ("debug-private-key", bpo::value<vector<string>>()->composing()->multitoken()->
           DEFAULT_VALUE_VECTOR(std::make_pair(chain::public_key_type(default_priv_key.get_public_key()), graphene::utilities::key_to_wif(default_priv_key))),
           "Tuple of [PublicKey, WIF private key] (may specify multiple times)");
    config_file_options.add(command_line_options);
@@ -63,9 +63,9 @@ void debug_witness_plugin::plugin_initialize(const boost::program_options::varia
    ilog("debug_witness plugin:  plugin_initialize() begin");
    _options = &options;
 
-   if( options.count("private-key") )
+   if( options.count("debug-private-key") )
    {
-      const std::vector<std::string> key_id_to_wif_pair_strings = options["private-key"].as<std::vector<std::string>>();
+      const std::vector<std::string> key_id_to_wif_pair_strings = options["debug-private-key"].as<std::vector<std::string>>();
       for (const std::string& key_id_to_wif_pair_string : key_id_to_wif_pair_strings)
       {
          auto key_id_to_wif_pair = graphene::app::dejsonify<std::pair<chain::public_key_type, std::string> >(key_id_to_wif_pair_string);

diff --git a/tests/tests/database_tests.cpp b/tests/tests/database_tests.cpp
@@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE( flat_index_test )
    price_feed current_feed;
    current_feed.settlement_price = bitusd.amount(100) / asset(100);
    publish_feed(bitusd, sam, current_feed);
-   FC_ASSERT( bitusd.bitasset_data_id->instance == 0 );
+   FC_ASSERT( (int)bitusd.bitasset_data_id->instance == 0 );
    FC_ASSERT( !(*bitusd.bitasset_data_id)(db).current_feed.settlement_price.is_null() );
    try {
       auto ses = db._undo_db.start_undo_session();