提交 c12a9590 编写于 作者: B Bart Wyatt

fixes based on new plugin architecture; fix for late connection destruction; remove spurious logs

上级 bd3f977b
......@@ -1165,13 +1165,10 @@ void controller::log_irreversible_blocks() {
*/
}
signed_block_ptr controller::fetch_block_by_id( block_id_type id )const {
idump((id));
auto state = my->fork_db.get_block(id);
if( state ) return state->block;
edump((block_header::num_from_id(id)));
auto bptr = fetch_block_by_number( block_header::num_from_id(id) );
if( bptr && bptr->id() == id ) return bptr;
elog( "not found" );
return signed_block_ptr();
}
......@@ -1181,7 +1178,6 @@ signed_block_ptr controller::fetch_block_by_number( uint32_t block_num )const {
return blk_state->block;
}
ilog( "blog read by number ${n}", ("n", block_num) );
return my->blog.read_block_by_num(block_num);
} FC_CAPTURE_AND_RETHROW( (block_num) ) }
......@@ -1191,7 +1187,6 @@ block_id_type controller::get_block_id_for_num( uint32_t block_num )const { try
return blk_state->id;
}
ilog( "blog read by number ${n}", ("n", block_num) );
return my->blog.read_block_by_num(block_num)->id();
} FC_CAPTURE_AND_RETHROW( (block_num) ) }
......
......@@ -2005,9 +2005,15 @@ namespace eosio {
if(!conn->socket) {
return;
}
connection_wptr weak_conn = conn;
conn->socket->async_read_some
(conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(),
[this,conn]( boost::system::error_code ec, std::size_t bytes_transferred ) {
[this,weak_conn]( boost::system::error_code ec, std::size_t bytes_transferred ) {
auto conn = weak_conn.lock();
if (!conn) {
return;
}
try {
if( !ec ) {
if (bytes_transferred > conn->pending_message_buffer.bytes_to_write()) {
......
......@@ -72,8 +72,8 @@ using namespace eosio::chain;
struct txn_test_gen_plugin_impl {
void push_transaction( signed_transaction& trx ) { try {
controller& cc = app().get_plugin<chain_plugin>().chain();
return cc.push_transaction( std::make_shared<transaction_metadata>(trx) );
chain_plugin& cp = app().get_plugin<chain_plugin>();
return cp.accept_transaction( packed_transaction(trx) );
} FC_CAPTURE_AND_RETHROW( (transaction_header(trx)) ) }
void create_test_accounts(const std::string& init_name, const std::string& init_priv_key) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册