dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Simplifying bootstrap_attempt::mode_text and returning the direct char const * instead of converting it to std::string. (#3869)

Browse source
This commit is contained in:
clemahieu 2022-07-21 13:10:38 +01:00 • committed by GitHub
commit 7d203289bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
nano/node/bootstrap/bootstrap_attempt.cpp
View file

@ -95,22 +95,18 @@ void nano::bootstrap_attempt::stop ()
node->bootstrap_initiator.connections->clear_pulls (incremental_id);
}
std::string nano::bootstrap_attempt::mode_text ()
char const * nano::bootstrap_attempt::mode_text ()
{
std::string mode_text;
if (mode == nano::bootstrap_mode::legacy)
switch (mode)
{
mode_text = "legacy";
case nano::bootstrap_mode::legacy:
return "legacy";
case nano::bootstrap_mode::lazy:
return "lazy";
case nano::bootstrap_mode::wallet_lazy:
return "wallet_lazy";
}
else if (mode == nano::bootstrap_mode::lazy)
{
mode_text = "lazy";
}
else if (mode == nano::bootstrap_mode::wallet_lazy)
{
mode_text = "wallet_lazy";
}
return mode_text;
return "unknown";
}
bool nano::bootstrap_attempt::process_block (std::shared_ptr<nano::block> const & block_a, nano::account const & known_account_a, uint64_t pull_blocks_processed, nano::bulk_pull::count_t max_blocks, bool block_expected, unsigned retry_limit)

2
nano/node/bootstrap/bootstrap_attempt.hpp
View file

@ -26,7 +26,7 @@ public:
void pull_started ();
void pull_finished ();
bool should_log ();
std::string mode_text ();
char const * mode_text ();
virtual bool process_block (std::shared_ptr<nano::block> const &, nano::account const &, uint64_t, nano::bulk_pull::count_t, bool, unsigned);
virtual void get_information (boost::property_tree::ptree &) = 0;
virtual void block_processed (nano::transaction const & tx, nano::process_return const & result, nano::block const & block);