Remove unused txs member in NOTIFY_RESPONSE_GET_OBJECT
This commit is contained in:
parent
fd3ff74164
commit
f17dcde451
|
@ -1912,8 +1912,6 @@ bool Blockchain::handle_get_objects(NOTIFY_REQUEST_GET_OBJECTS::request& arg, NO
|
||||||
//pack block
|
//pack block
|
||||||
e.block = std::move(bl.first);
|
e.block = std::move(bl.first);
|
||||||
}
|
}
|
||||||
//get and pack other transactions, if needed
|
|
||||||
get_transactions_blobs(arg.txs, rsp.txs, rsp.missed_ids);
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -172,11 +172,8 @@ namespace cryptonote
|
||||||
|
|
||||||
struct request_t
|
struct request_t
|
||||||
{
|
{
|
||||||
std::vector<crypto::hash> txs;
|
|
||||||
std::vector<crypto::hash> blocks;
|
std::vector<crypto::hash> blocks;
|
||||||
|
|
||||||
BEGIN_KV_SERIALIZE_MAP()
|
BEGIN_KV_SERIALIZE_MAP()
|
||||||
KV_SERIALIZE_CONTAINER_POD_AS_BLOB(txs)
|
|
||||||
KV_SERIALIZE_CONTAINER_POD_AS_BLOB(blocks)
|
KV_SERIALIZE_CONTAINER_POD_AS_BLOB(blocks)
|
||||||
END_KV_SERIALIZE_MAP()
|
END_KV_SERIALIZE_MAP()
|
||||||
};
|
};
|
||||||
|
@ -189,13 +186,11 @@ namespace cryptonote
|
||||||
|
|
||||||
struct request_t
|
struct request_t
|
||||||
{
|
{
|
||||||
std::vector<blobdata> txs;
|
|
||||||
std::vector<block_complete_entry> blocks;
|
std::vector<block_complete_entry> blocks;
|
||||||
std::vector<crypto::hash> missed_ids;
|
std::vector<crypto::hash> missed_ids;
|
||||||
uint64_t current_blockchain_height;
|
uint64_t current_blockchain_height;
|
||||||
|
|
||||||
BEGIN_KV_SERIALIZE_MAP()
|
BEGIN_KV_SERIALIZE_MAP()
|
||||||
KV_SERIALIZE(txs)
|
|
||||||
KV_SERIALIZE(blocks)
|
KV_SERIALIZE(blocks)
|
||||||
KV_SERIALIZE_CONTAINER_POD_AS_BLOB(missed_ids)
|
KV_SERIALIZE_CONTAINER_POD_AS_BLOB(missed_ids)
|
||||||
KV_SERIALIZE(current_blockchain_height)
|
KV_SERIALIZE(current_blockchain_height)
|
||||||
|
|
|
@ -928,13 +928,12 @@ namespace cryptonote
|
||||||
template<class t_core>
|
template<class t_core>
|
||||||
int t_cryptonote_protocol_handler<t_core>::handle_request_get_objects(int command, NOTIFY_REQUEST_GET_OBJECTS::request& arg, cryptonote_connection_context& context)
|
int t_cryptonote_protocol_handler<t_core>::handle_request_get_objects(int command, NOTIFY_REQUEST_GET_OBJECTS::request& arg, cryptonote_connection_context& context)
|
||||||
{
|
{
|
||||||
MLOG_P2P_MESSAGE("Received NOTIFY_REQUEST_GET_OBJECTS (" << arg.blocks.size() << " blocks, " << arg.txs.size() << " txes)");
|
MLOG_P2P_MESSAGE("Received NOTIFY_REQUEST_GET_OBJECTS (" << arg.blocks.size() << " blocks)");
|
||||||
|
if (arg.blocks.size() > CURRENCY_PROTOCOL_MAX_OBJECT_REQUEST_COUNT)
|
||||||
if (arg.blocks.size() + arg.txs.size() > CURRENCY_PROTOCOL_MAX_OBJECT_REQUEST_COUNT)
|
|
||||||
{
|
{
|
||||||
LOG_ERROR_CCONTEXT(
|
LOG_ERROR_CCONTEXT(
|
||||||
"Requested objects count is too big ("
|
"Requested objects count is too big ("
|
||||||
<< arg.blocks.size() + arg.txs.size() << ") expected not more then "
|
<< arg.blocks.size() << ") expected not more then "
|
||||||
<< CURRENCY_PROTOCOL_MAX_OBJECT_REQUEST_COUNT);
|
<< CURRENCY_PROTOCOL_MAX_OBJECT_REQUEST_COUNT);
|
||||||
drop_connection(context, false, false);
|
drop_connection(context, false, false);
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -947,8 +946,9 @@ namespace cryptonote
|
||||||
drop_connection(context, false, false);
|
drop_connection(context, false, false);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
MLOG_P2P_MESSAGE("-->>NOTIFY_RESPONSE_GET_OBJECTS: blocks.size()=" << rsp.blocks.size() << ", txs.size()=" << rsp.txs.size()
|
MLOG_P2P_MESSAGE("-->>NOTIFY_RESPONSE_GET_OBJECTS: blocks.size()="
|
||||||
<< ", rsp.m_current_blockchain_height=" << rsp.current_blockchain_height << ", missed_ids.size()=" << rsp.missed_ids.size());
|
<< rsp.blocks.size() << ", rsp.m_current_blockchain_height=" << rsp.current_blockchain_height
|
||||||
|
<< ", missed_ids.size()=" << rsp.missed_ids.size());
|
||||||
post_notify<NOTIFY_RESPONSE_GET_OBJECTS>(rsp, context);
|
post_notify<NOTIFY_RESPONSE_GET_OBJECTS>(rsp, context);
|
||||||
//handler_response_blocks_now(sizeof(rsp)); // XXX
|
//handler_response_blocks_now(sizeof(rsp)); // XXX
|
||||||
//handler_response_blocks_now(200);
|
//handler_response_blocks_now(200);
|
||||||
|
@ -973,7 +973,7 @@ namespace cryptonote
|
||||||
template<class t_core>
|
template<class t_core>
|
||||||
int t_cryptonote_protocol_handler<t_core>::handle_response_get_objects(int command, NOTIFY_RESPONSE_GET_OBJECTS::request& arg, cryptonote_connection_context& context)
|
int t_cryptonote_protocol_handler<t_core>::handle_response_get_objects(int command, NOTIFY_RESPONSE_GET_OBJECTS::request& arg, cryptonote_connection_context& context)
|
||||||
{
|
{
|
||||||
MLOG_P2P_MESSAGE("Received NOTIFY_RESPONSE_GET_OBJECTS (" << arg.blocks.size() << " blocks, " << arg.txs.size() << " txes)");
|
MLOG_P2P_MESSAGE("Received NOTIFY_RESPONSE_GET_OBJECTS (" << arg.blocks.size() << " blocks)");
|
||||||
MLOG_PEER_STATE("received objects");
|
MLOG_PEER_STATE("received objects");
|
||||||
|
|
||||||
boost::posix_time::ptime request_time = context.m_last_request_time;
|
boost::posix_time::ptime request_time = context.m_last_request_time;
|
||||||
|
@ -981,8 +981,6 @@ namespace cryptonote
|
||||||
|
|
||||||
// calculate size of request
|
// calculate size of request
|
||||||
size_t size = 0;
|
size_t size = 0;
|
||||||
for (const auto &element : arg.txs) size += element.size();
|
|
||||||
|
|
||||||
size_t blocks_size = 0;
|
size_t blocks_size = 0;
|
||||||
for (const auto &element : arg.blocks) {
|
for (const auto &element : arg.blocks) {
|
||||||
blocks_size += element.block.size();
|
blocks_size += element.block.size();
|
||||||
|
@ -1942,7 +1940,7 @@ skip:
|
||||||
}
|
}
|
||||||
|
|
||||||
context.m_last_request_time = boost::posix_time::microsec_clock::universal_time();
|
context.m_last_request_time = boost::posix_time::microsec_clock::universal_time();
|
||||||
MLOG_P2P_MESSAGE("-->>NOTIFY_REQUEST_GET_OBJECTS: blocks.size()=" << req.blocks.size() << ", txs.size()=" << req.txs.size()
|
MLOG_P2P_MESSAGE("-->>NOTIFY_REQUEST_GET_OBJECTS: blocks.size()=" << req.blocks.size()
|
||||||
<< "requested blocks count=" << count << " / " << count_limit << " from " << span.first << ", first hash " << req.blocks.front());
|
<< "requested blocks count=" << count << " / " << count_limit << " from " << span.first << ", first hash " << req.blocks.front());
|
||||||
//epee::net_utils::network_throttle_manager::get_global_throttle_inreq().logger_handle_net("log/dr-monero/net/req-all.data", sec, get_avg_block_size());
|
//epee::net_utils::network_throttle_manager::get_global_throttle_inreq().logger_handle_net("log/dr-monero/net/req-all.data", sec, get_avg_block_size());
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue