style: More clang-tidy identifier renaming (#7290)

This commit is contained in:
Alex Kremer
2026-05-20 22:31:15 +01:00
committed by GitHub
parent 8c0080020f
commit a830ab10ef
160 changed files with 1726 additions and 1746 deletions

View File

@@ -286,14 +286,14 @@ public:
return 1;
#else
if (config.IO_WORKERS > 0)
return config.IO_WORKERS;
if (config.ioWorkers > 0)
return config.ioWorkers;
auto const cores = std::thread::hardware_concurrency();
// Use a single thread when running on under-provisioned systems
// or if we are configured to use minimal resources.
if ((cores == 1) || ((config.NODE_SIZE == 0) && (cores == 2)))
if ((cores == 1) || ((config.nodeSize == 0) && (cores == 2)))
return 1;
// Otherwise, prefer six threads.
@@ -316,7 +316,7 @@ public:
// PerfLog must be started before any other threads are launched.
, perfLog_(
perf::makePerfLog(
perf::setupPerfLog(config_->section("perf"), config_->CONFIG_DIR),
perf::setupPerfLog(config_->section("perf"), config_->configDir),
*this,
logs_->journal("PerfLog"),
[this] { signalStop("PerfLog"); }))
@@ -326,22 +326,22 @@ public:
, jobQueue_(
std::make_unique<JobQueue>(
[](std::unique_ptr<Config> const& config) {
if (config->standalone() && !config->FORCE_MULTI_THREAD)
if (config->standalone() && !config->forceMultiThread)
return 1;
if (config->WORKERS)
return config->WORKERS;
if (config->workers)
return config->workers;
auto count = static_cast<int>(std::thread::hardware_concurrency());
// Be more aggressive about the number of threads to use
// for the job queue if the server is configured as
// "large" or "huge" if there are enough cores.
if (config->NODE_SIZE >= 4 && count >= 16)
if (config->nodeSize >= 4 && count >= 16)
{
count = 6 + std::min(count, 8);
}
else if (config->NODE_SIZE >= 3 && count >= 8)
else if (config->nodeSize >= 3 && count >= 8)
{
count = 4 + std::min(count, 6);
}
@@ -370,16 +370,16 @@ public:
std::chrono::minutes(1),
stopwatch(),
logs_->journal("CachedSLEs"))
, networkIDService_(std::make_unique<NetworkIDServiceImpl>(config_->NETWORK_ID))
, networkIDService_(std::make_unique<NetworkIDServiceImpl>(config_->networkId))
, validatorKeys_(*config_, journal_)
, resourceManager_(
Resource::makeManager(collectorManager_->collector(), logs_->journal("Resource")))
, nodeStore_(shaMapStore_->makeNodeStore(
config_->PREFETCH_WORKERS > 0 ? config_->PREFETCH_WORKERS : 4))
config_->prefetchWorkers > 0 ? config_->prefetchWorkers : 4))
, nodeFamily_(*this, *collectorManager_)
, orderBookDB_(makeOrderBookDb(
*this,
{.pathSearchMax = config_->PATH_SEARCH_MAX, .standalone = config_->standalone()}))
{.pathSearchMax = config_->pathSearchMax, .standalone = config_->standalone()}))
, pathRequestManager_(
std::make_unique<PathRequestManager>(
*this,
@@ -415,8 +415,8 @@ public:
*this,
stopwatch(),
config_->standalone(),
config_->NETWORK_QUORUM,
config_->START_VALID,
config_->networkQuorum,
config_->startValid,
*jobQueue_,
*ledgerMaster_,
validatorKeys_,
@@ -435,7 +435,7 @@ public:
*timeKeeper_,
config_->legacy("database_path"),
logs_->journal("ValidatorList"),
config_->VALIDATION_QUORUM))
config_->validationQuorum))
, validatorSites_(std::make_unique<ValidatorSite>(*this))
, serverHandler_(makeServerHandler(
*this,
@@ -918,7 +918,7 @@ public:
{
using namespace std::chrono;
sweepTimer_.expires_after(
seconds{config_->SWEEP_INTERVAL.value_or(
seconds{config_->sweepInterval.value_or(
config_->getValueFor(SizedItem::SweepInterval))});
sweepTimer_.async_wait(std::move(*optionalCountedHandler));
}
@@ -1226,7 +1226,7 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
amendmentTable_ = makeAmendmentTable(
*this,
config().AMENDMENT_MAJORITY_TIME,
config().amendmentMajorityTime,
supported,
upVoted,
downVoted,
@@ -1235,7 +1235,7 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
Pathfinder::initPathTable();
auto const startUp = config_->START_UP;
auto const startUp = config_->startUp;
JLOG(journal_.debug()) << "startUp: " << startUp;
if (startUp == StartUpType::Fresh)
{
@@ -1250,13 +1250,13 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
JLOG(journal_.info()) << "Loading specified Ledger";
if (!loadOldLedger(
config_->START_LEDGER,
config_->startLedger,
startUp == StartUpType::Replay,
startUp == StartUpType::LoadFile,
config_->TRAP_TX_HASH))
config_->trapTxHash))
{
JLOG(journal_.error()) << "The specified ledger could not be loaded.";
if (config_->FAST_LOAD)
if (config_->fastLoad)
{
// Fall back to syncing from the network, such as
// when there's no existing data.
@@ -1282,7 +1282,7 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
startGenesisLedger();
}
if (auto const& forcedRange = config().FORCED_LEDGER_RANGE_PRESENT)
if (auto const& forcedRange = config().forcedLedgerRangePresent)
{
ledgerMaster_->setLedgerRangePresent(forcedRange->first, forcedRange->second);
}
@@ -1328,7 +1328,7 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
localSigningKey,
config().section(SECTION_VALIDATORS).values(),
config().section(SECTION_VALIDATOR_LIST_KEYS).values(),
config().VALIDATOR_LIST_THRESHOLD))
config().validatorListThreshold))
{
JLOG(journal_.fatal()) << "Invalid entry in validator configuration.";
return false;
@@ -1399,7 +1399,7 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
{
// Should this message be here, conceptually? In theory this sort
// of message, if displayed, should be displayed from PeerFinder.
if (config_->PEER_PRIVATE && config_->IPS_FIXED.empty())
if (config_->peerPrivate && config_->ipsFixed.empty())
{
JLOG(journal_.warn()) << "No outbound peer connections will be made";
}
@@ -1659,14 +1659,14 @@ ApplicationImp::fdRequired() const
void
ApplicationImp::startGenesisLedger()
{
std::vector<uint256> const initialAmendments = (config_->START_UP == StartUpType::Fresh)
std::vector<uint256> const initialAmendments = (config_->startUp == StartUpType::Fresh)
? amendmentTable_->getDesired()
: std::vector<uint256>{};
std::shared_ptr<Ledger> const genesis = std::make_shared<Ledger>(
kCreateGenesis,
Rules{config_->features},
config_->FEES.toFees(),
config_->fees.toFees(),
initialAmendments,
nodeFamily_);
ledgerMaster_->storeLedger(genesis);
@@ -1690,7 +1690,7 @@ ApplicationImp::getLastFullLedger()
try
{
auto const [ledger, seq, hash] =
getLatestLedger(Rules{config_->features}, config_->FEES.toFees(), *this);
getLatestLedger(Rules{config_->features}, config_->fees.toFees(), *this);
if (!ledger)
return ledger;
@@ -1802,7 +1802,7 @@ ApplicationImp::loadLedgerFromFile(std::string const& name)
}
auto loadLedger = std::make_shared<Ledger>(
seq, closeTime, Rules{config_->features}, config_->FEES.toFees(), nodeFamily_);
seq, closeTime, Rules{config_->features}, config_->fees.toFees(), nodeFamily_);
loadLedger->setTotalDrops(totalDrops);
for (json::UInt index = 0; index < ledger.get().size(); ++index)
@@ -1883,7 +1883,7 @@ ApplicationImp::loadOldLedger(
if (hash.parseHex(ledgerID))
{
loadLedger =
loadByHash(hash, Rules{config_->features}, config_->FEES.toFees(), *this);
loadByHash(hash, Rules{config_->features}, config_->fees.toFees(), *this);
if (!loadLedger)
{
@@ -1912,7 +1912,7 @@ ApplicationImp::loadOldLedger(
if (beast::lexicalCastChecked(index, ledgerID))
{
loadLedger =
loadByIndex(index, Rules{config_->features}, config_->FEES.toFees(), *this);
loadByIndex(index, Rules{config_->features}, config_->fees.toFees(), *this);
}
}
@@ -1931,7 +1931,7 @@ ApplicationImp::loadOldLedger(
loadLedger = loadByHash(
replayLedger->header().parentHash,
Rules{config_->features},
config_->FEES.toFees(),
config_->fees.toFees(),
*this);
if (!loadLedger)
{
@@ -2078,7 +2078,7 @@ ApplicationImp::loadOldLedger(
bool
ApplicationImp::serverOkay(std::string& reason)
{
if (!config().ELB_SUPPORT)
if (!config().elbSupport)
return true;
if (isStopping())