Remove MSG_WITNESS_TX

This commit is contained in:
Alexander Block 2020-04-06 13:58:50 +02:00
parent 74eabc23e5
commit 8c11a8e698

View File

@ -3367,7 +3367,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
vRecv >> vInv; vRecv >> vInv;
if (vInv.size() <= MAX_PEER_TX_IN_FLIGHT + MAX_BLOCKS_IN_TRANSIT_PER_PEER) { if (vInv.size() <= MAX_PEER_TX_IN_FLIGHT + MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
for (CInv &inv : vInv) { for (CInv &inv : vInv) {
if (inv.type == MSG_TX || inv.type == MSG_WITNESS_TX) { if (inv.type == MSG_TX) {
// If we receive a NOTFOUND message for a txid we requested, erase // If we receive a NOTFOUND message for a txid we requested, erase
// it from our data structures for this peer. // it from our data structures for this peer.
auto in_flight_it = state->m_tx_download.m_tx_in_flight.find(inv.hash); auto in_flight_it = state->m_tx_download.m_tx_in_flight.find(inv.hash);
@ -4254,7 +4254,7 @@ bool PeerLogicValidation::SendMessages(CNode* pto, std::atomic<bool>& interruptM
// Erase this entry from tx_process_time (it may be added back for // Erase this entry from tx_process_time (it may be added back for
// processing at a later time, see below) // processing at a later time, see below)
tx_process_time.erase(tx_process_time.begin()); tx_process_time.erase(tx_process_time.begin());
CInv inv(MSG_TX | GetFetchFlags(pto), txid); CInv inv(MSG_TX, txid);
if (!AlreadyHave(inv)) { if (!AlreadyHave(inv)) {
// If this transaction was last requested more than 1 minute ago, // If this transaction was last requested more than 1 minute ago,
// then request. // then request.