Skip to content

Commit

Permalink
Cleanup for merge #3451
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvandeberg
mvandeberg committed Oct 24, 2019
1 parent 18aa9d9 commit 5c036ba
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 35 deletions.
1 change: 0 additions & 1 deletion libraries/chain/include/steem/chain/generic_custom_operation_interpreter.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ void custom_op_from_variant( const fc::variant& var, CustomOperationType& vo )
}
else // new serialization
{
idump( (var) );
FC_ASSERT( var.is_object(), "Input data have to treated as object." );
auto v_object = var.get_object();

Expand Down
2 changes: 0 additions & 2 deletions libraries/fc/include/fc/static_variant.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,8 +401,6 @@ struct visitor {
return name_map;
}();

idump( (v) );

FC_ASSERT( v.is_object(), "Input data have to treated as object." );
auto v_object = v.get_object();

Expand Down
7 changes: 0 additions & 7 deletions libraries/plugins/apis/condenser_api/condenser_api_legacy_operations.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,9 @@ void from_variant( const fc::variant& var, steem::plugins::condenser_api::legacy
vo.set_which( ar[0].as_uint64() );
else
{
idump( (to_tag) );
idump( (ar[0].as_string()) );
auto itr = to_tag.find(ar[0].as_string());
if( itr == to_tag.end() )
{
idump( (to_full_tag) );
itr = to_full_tag.find(ar[0].as_string());
FC_ASSERT( itr != to_full_tag.end(), "Invalid operation name: ${n}", ("n", ar[0]) );
}
Expand All @@ -109,7 +106,6 @@ void to_variant( const steem::plugins::condenser_api::legacy_comment_options_ext

void from_variant( const fc::variant& v, steem::plugins::condenser_api::legacy_comment_options_extensions& sv )
{
idump( (v) );
old_sv_from_variant( v, sv );
}

Expand All @@ -130,7 +126,6 @@ void to_variant( const steem::plugins::condenser_api::legacy_smt_generation_poli

void from_variant( const fc::variant& v, steem::plugins::condenser_api::legacy_smt_generation_policy& sv )
{
idump( (v) );
old_sv_from_variant( v, sv );
}

Expand All @@ -141,7 +136,6 @@ void to_variant( const steem::plugins::condenser_api::legacy_smt_setup_parameter

void from_variant( const fc::variant& v, steem::plugins::condenser_api::legacy_smt_setup_parameter& sv )
{
idump( (v) );
old_sv_from_variant( v, sv );
}

Expand All @@ -152,7 +146,6 @@ void to_variant( const steem::plugins::condenser_api::legacy_smt_runtime_paramet

void from_variant( const fc::variant& v, steem::plugins::condenser_api::legacy_smt_runtime_parameter& sv )
{
idump( (v) );
old_sv_from_variant( v, sv );
}

Expand Down
2 changes: 0 additions & 2 deletions ...pis/condenser_api/include/steem/plugins/condenser_api/condenser_api_legacy_operations.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1795,7 +1795,6 @@ struct to_old_static_variant
typedef void result_type;
template<typename T> void operator()( T& v )const
{
idump( (v) );
from_variant( var, v );
}
};
Expand All @@ -1813,7 +1812,6 @@ void old_sv_to_variant( const T& sv, fc::variant& v )
template< typename T >
void old_sv_from_variant( const fc::variant& v, T& sv )
{
idump( (v) );
auto ar = v.get_array();
if( ar.size() < 2 ) return;
sv.set_which( static_cast< int64_t >( ar[0].as_uint64() ) );
Expand Down
2 changes: 0 additions & 2 deletions libraries/plugins/apis/database_api/database_api.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1744,7 +1744,6 @@ DEFINE_API_IMPL( database_api_impl, get_potential_signatures )

DEFINE_API_IMPL( database_api_impl, verify_authority )
{
try{
args.trx.verify_authority(_db.get_chain_id(),
[&]( string account_name ){ return authority( _db.get< chain::account_authority_object, chain::by_account >( account_name ).active ); },
[&]( string account_name ){ return authority( _db.get< chain::account_authority_object, chain::by_account >( account_name ).owner ); },
Expand All @@ -1754,7 +1753,6 @@ DEFINE_API_IMPL( database_api_impl, verify_authority )
STEEM_MAX_SIG_CHECK_ACCOUNTS,
_db.has_hardfork( STEEM_HARDFORK_0_20__1944 ) ? fc::ecc::canonical_signature_type::bip_0062 : fc::ecc::canonical_signature_type::fc_canonical );
return verify_authority_return( { true } );
}FC_LOG_AND_RETHROW()
}

// TODO: This is broken. By the look of is, it has been since BitShares. verify_authority always
Expand Down
1 change: 0 additions & 1 deletion libraries/plugins/json_rpc/json_rpc_plugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,6 @@ void json_rpc_plugin::add_api_method( const string& api_name, const string& meth

string json_rpc_plugin::call( const string& message )
{
ddump( (message) );
STATSD_START_TIMER( "jsonrpc", "overhead", "call", 1.0f );
try
{
Expand Down
5 changes: 0 additions & 5 deletions libraries/plugins/webserver/webserver_plugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,10 +289,7 @@ void webserver_plugin_impl::handle_ws_message( websocket_server_type* server, co
try
{
if( msg->get_opcode() == websocketpp::frame::opcode::text )
{
ddump((msg->get_payload()));
con->send( api->call( msg->get_payload() ) );
}
else
con->send( "error: string payload expected" );
}
Expand Down Expand Up @@ -329,7 +326,6 @@ void webserver_plugin_impl::handle_http_message( websocket_server_type* server,
thread_pool_ios.post( [con, this]()
{
auto body = con->get_request_body();
ddump((body));

try
{
Expand Down Expand Up @@ -375,7 +371,6 @@ void webserver_plugin_impl::handle_http_request(websocket_local_server_type* ser
thread_pool_ios.post( [con, this]()
{
auto body = con->get_request_body();
ddump((body));

try
{
Expand Down
17 changes: 2 additions & 15 deletions tests/tests/smt_operation_tests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1062,7 +1062,7 @@ BOOST_AUTO_TEST_CASE( claim_reward_balance2_validate )
op.reward_tokens.push_back( asset( 1, smt2 ) );
op.reward_tokens.push_back( asset( 1, smt3 ) );
op.validate();
edump((op));

op.reward_tokens.clear();

BOOST_TEST_MESSAGE( "Testing invalid rewards" );
Expand Down Expand Up @@ -1566,7 +1566,6 @@ BOOST_AUTO_TEST_CASE( smt_create_validate )
// If this fails, it could indicate a test above has failed for the wrong reasons
op.symbol = get_new_smt_symbol( 3, db );
op.validate();
edump((op));
}
FC_LOG_AND_RETHROW()
}
Expand Down Expand Up @@ -2183,7 +2182,6 @@ BOOST_AUTO_TEST_CASE( smt_setup_emissions_validate )
op.rep_time = tp;

op.validate();
edump((op));
}
FC_LOG_AND_RETHROW()
}
Expand Down Expand Up @@ -2361,7 +2359,6 @@ BOOST_AUTO_TEST_CASE( set_setup_parameters_validate )
op.setup_parameters.clear();
op.setup_parameters.emplace( smt_param_allow_voting { .value = false } );
op.validate();
edump((op));
}
FC_LOG_AND_RETHROW()
}
Expand Down Expand Up @@ -2670,7 +2667,7 @@ BOOST_AUTO_TEST_CASE( smt_set_runtime_parameters_validate )
op.runtime_parameters.clear();
op.runtime_parameters.insert( vote_regen );
op.validate();
edump((op));

/*
* Conditions to test:
*
Expand Down Expand Up @@ -2916,7 +2913,6 @@ BOOST_AUTO_TEST_CASE( smt_contribute_validate )
op.symbol = new_symbol;

op.validate();
edump((op));
}
FC_LOG_AND_RETHROW()
}
Expand Down Expand Up @@ -3843,7 +3839,6 @@ BOOST_AUTO_TEST_CASE( smt_setup_validate )

BOOST_TEST_MESSAGE( " -- Successful sanity check" );
op.validate();
edump((op));
}


Expand Down Expand Up @@ -4426,8 +4421,6 @@ BOOST_AUTO_TEST_CASE( comment_votable_assets_validate )
op.extensions.clear();
op.extensions.insert( ava );
op.validate();

edump( (op) );
}
}
FC_LOG_AND_RETHROW()
Expand Down Expand Up @@ -5089,8 +5082,6 @@ BOOST_AUTO_TEST_CASE( vote2_apply )
tx.operations.push_back( op );
sign( tx, alice_private_key );

edump((op));

db->push_transaction( tx, 0 );

auto& alice_comment = db->get_comment( "alice", string( "foo" ) );
Expand Down Expand Up @@ -5786,10 +5777,6 @@ BOOST_AUTO_TEST_CASE( vote2_apply )
BOOST_REQUIRE( sam_smt.downvote_manabar.current_mana == old_smt_downvote_manabar.current_mana );
}
}

edump( (STEEM_SYMBOL) );
edump( (SBD_SYMBOL) );
edump( (VESTS_SYMBOL) );
}
FC_LOG_AND_RETHROW()
}
Expand Down

0 comments on commit 5c036ba

Please sign in to comment.