rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-26 01:12:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7294

Browse source 
f10c9a1 remove obsolete pruning debug code (moneromooo-monero)
This commit is contained in:
luigi1111 2021-02-15 21:51:12 -05:00
commit 2222d90491
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
4 changed files with 0 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/cryptonote_config.h
View file

@ -194,7 +194,6 @@
#define CRYPTONOTE_PRUNING_STRIPE_SIZE 4096 // the smaller, the smoother the increase #define CRYPTONOTE_PRUNING_STRIPE_SIZE 4096 // the smaller, the smoother the increase
#define CRYPTONOTE_PRUNING_LOG_STRIPES 3 // the higher, the more space saved #define CRYPTONOTE_PRUNING_LOG_STRIPES 3 // the higher, the more space saved
#define CRYPTONOTE_PRUNING_TIP_BLOCKS 5500 // the smaller, the more space saved #define CRYPTONOTE_PRUNING_TIP_BLOCKS 5500 // the smaller, the more space saved
//#define CRYPTONOTE_PRUNING_DEBUG_SPOOF_SEED
#define RPC_CREDITS_PER_HASH_SCALE ((float)(1<<24)) #define RPC_CREDITS_PER_HASH_SCALE ((float)(1<<24))

4
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View file

@ -338,10 +338,6 @@ namespace cryptonote
} }
context.m_remote_blockchain_height = hshd.current_height; context.m_remote_blockchain_height = hshd.current_height;
context.m_pruning_seed = hshd.pruning_seed; context.m_pruning_seed = hshd.pruning_seed;
#ifdef CRYPTONOTE_PRUNING_DEBUG_SPOOF_SEED
context.m_pruning_seed = tools::make_pruning_seed(1 + (context.m_remote_address.as<epee::net_utils::ipv4_network_address>().ip()) % (1 << CRYPTONOTE_PRUNING_LOG_STRIPES), CRYPTONOTE_PRUNING_LOG_STRIPES);
LOG_INFO_CC(context, "New connection posing as pruning seed " << epee::string_tools::to_string_hex(context.m_pruning_seed) << ", seed address " << &context.m_pruning_seed);
#endif
uint64_t target = m_core.get_target_blockchain_height(); uint64_t target = m_core.get_target_blockchain_height();
if (target == 0) if (target == 0)

30
src/p2p/net_node.inl
View file

@ -897,32 +897,6 @@ namespace nodetool
for(const auto& p: m_command_line_peers) for(const auto& p: m_command_line_peers)
m_network_zones.at(p.adr.get_zone()).m_peerlist.append_with_peer_white(p); m_network_zones.at(p.adr.get_zone()).m_peerlist.append_with_peer_white(p);
// all peers are now setup
#ifdef CRYPTONOTE_PRUNING_DEBUG_SPOOF_SEED
for (auto& zone : m_network_zones)
{
std::list<peerlist_entry> plw;
while (zone.second.m_peerlist.get_white_peers_count())
{
plw.push_back(peerlist_entry());
zone.second.m_peerlist.get_white_peer_by_index(plw.back(), 0);
zone.second.m_peerlist.remove_from_peer_white(plw.back());
}
for (auto &e:plw)
zone.second.m_peerlist.append_with_peer_white(e);
std::list<peerlist_entry> plg;
while (zone.second.m_peerlist.get_gray_peers_count())
{
plg.push_back(peerlist_entry());
zone.second.m_peerlist.get_gray_peer_by_index(plg.back(), 0);
zone.second.m_peerlist.remove_from_peer_gray(plg.back());
}
for (auto &e:plg)
zone.second.m_peerlist.append_with_peer_gray(e);
}
#endif
//only in case if we really sure that we have external visible ip //only in case if we really sure that we have external visible ip
m_have_address = true; m_have_address = true;
@ -2132,10 +2106,6 @@ namespace nodetool
continue; continue;
} }
local_peerlist[i].last_seen = 0; local_peerlist[i].last_seen = 0;
#ifdef CRYPTONOTE_PRUNING_DEBUG_SPOOF_SEED
be.pruning_seed = tools::make_pruning_seed(1 + (be.adr.as<epee::net_utils::ipv4_network_address>().ip()) % (1ul << CRYPTONOTE_PRUNING_LOG_STRIPES), CRYPTONOTE_PRUNING_LOG_STRIPES);
#endif
} }
return true; return true;
} }

10
src/p2p/net_peerlist_boost_serialization.h
View file

@ -38,10 +38,6 @@
#include "net/i2p_address.h" #include "net/i2p_address.h"
#include "p2p/p2p_protocol_defs.h" #include "p2p/p2p_protocol_defs.h"
#ifdef CRYPTONOTE_PRUNING_DEBUG_SPOOF_SEED
#include "common/pruning.h"
#endif
BOOST_CLASS_VERSION(nodetool::peerlist_entry, 3) BOOST_CLASS_VERSION(nodetool::peerlist_entry, 3)
namespace boost namespace boost
@ -228,12 +224,6 @@ namespace boost
return; return;
} }
a & pl.pruning_seed; a & pl.pruning_seed;
#ifdef CRYPTONOTE_PRUNING_DEBUG_SPOOF_SEED
if (!typename Archive::is_saving())
{
pl.pruning_seed = tools::make_pruning_seed(1+pl.adr.as<epee::net_utils::ipv4_network_address>().ip() % (1<<CRYPTONOTE_PRUNING_LOG_STRIPES), CRYPTONOTE_PRUNING_LOG_STRIPES);
}
#endif
if (ver < 2) if (ver < 2)
{ {
if (!typename Archive::is_saving()) if (!typename Archive::is_saving())