ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-06-03 08:46:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename keylet::fees -> keylet::feeSettings

Browse Source
This commit is contained in:
Mayukha Vadari
2026-04-30 15:22:55 -04:00
parent b978001a89
commit 01adf22c8a
13 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/xrpl/protocol/Indexes.h
View File

@@ -68,7 +68,7 @@ skip(LedgerIndex ledger) noexcept;
/** The (fixed) index of the object containing the ledger fees. */
Keylet const&
fees() noexcept;
feeSettings() noexcept;
/** The (fixed) index of the object containing the ledger negativeUNL. */
Keylet const&

2
include/xrpl/protocol/detail/ledger_entries.macro
View File

@@ -292,7 +292,7 @@ LEDGER_ENTRY(ltRIPPLE_STATE, 0x0072, RippleState, state, ({
\note This is a singleton: only one such object exists in the ledger.
\sa keylet::fees
\sa keylet::feeSettings
*/
LEDGER_ENTRY(ltFEE_SETTINGS, 0x0073, FeeSettings, fee, ({
// Old version uses raw numbers

4
src/libxrpl/ledger/Ledger.cpp
View File

@@ -183,7 +183,7 @@ Ledger::Ledger(
}
{
auto sle = std::make_shared<SLE>(keylet::fees());
auto sle = std::make_shared<SLE>(keylet::feeSettings());
// Whether featureXRPFees is supported will depend on startup options.
if (std::ranges::find(amendments, featureXRPFees) != amendments.end())
{
@@ -580,7 +580,7 @@ Ledger::setup()
try
{
if (auto const sle = read(keylet::fees()))
if (auto const sle = read(keylet::feeSettings()))
{
bool oldFees = false;
bool newFees = false;

2
src/libxrpl/protocol/Indexes.cpp
View File

@@ -219,7 +219,7 @@ amendments() noexcept
}
Keylet const&
fees() noexcept
feeSettings() noexcept
{
static Keylet const ret{ltFEE_SETTINGS, indexHash(LedgerNameSpace::FEE_SETTINGS)};
return ret;

2
src/libxrpl/tx/transactors/system/Change.cpp
View File

@@ -256,7 +256,7 @@ Change::applyAmendment()
TER
Change::applyFee()
{
auto const k = keylet::fees();
auto const k = keylet::feeSettings();
SLE::pointer feeObject = view().peek(k);

2
src/test/app/FeeVote_test.cpp
View File

@@ -144,7 +144,7 @@ verifyFeeObject(
Rules const& rules,
FeeSettingsFields const& expected)
{
auto const feeObject = ledger->read(keylet::fees());
auto const feeObject = ledger->read(keylet::feeSettings());
if (!feeObject)
return false;

2
src/test/app/RCLValidations_test.cpp
View File

@@ -97,7 +97,7 @@ class RCLValidations_test : public beast::unit_test::suite
auto next = std::make_shared<Ledger>(*prev, env.app().getTimeKeeper().closeTime());
// Force a different hash on the first iteration
next->updateSkipList();
BEAST_EXPECT(next->read(keylet::fees()));
BEAST_EXPECT(next->read(keylet::feeSettings()));
if (forceHash)
{
next->setImmutable();

4
src/test/rpc/LedgerEntry_test.cpp
View File

@@ -1477,7 +1477,7 @@ class LedgerEntry_test : public beast::unit_test::suite
// positive test
{
Keylet const keylet = keylet::fees();
Keylet const keylet = keylet::feeSettings();
Json::Value jvParams;
jvParams[jss::fee] = to_string(keylet.key);
Json::Value const jrr =
@@ -2420,7 +2420,7 @@ class LedgerEntry_test : public beast::unit_test::suite
};
test(jss::amendments, jss::Amendments, keylet::amendments(), true);
test(jss::fee, jss::FeeSettings, keylet::fees(), true);
test(jss::fee, jss::FeeSettings, keylet::feeSettings(), true);
// There won't be an nunl
test(jss::nunl, jss::NegativeUNL, keylet::negativeUNL(), false);
// Can only get the short skip list this way

2
src/xrpld/app/ledger/detail/BuildLedger.cpp
View File

@@ -71,7 +71,7 @@ buildLedgerImpl(
// Accept ledger
XRPL_ASSERT(
built->header().seq < XRP_LEDGER_EARLIEST_FEES || built->read(keylet::fees()),
built->header().seq < XRP_LEDGER_EARLIEST_FEES || built->read(keylet::feeSettings()),
"xrpl::buildLedgerImpl : valid ledger fees");
built->setAccepted(closeTime, closeResolution, closeTimeCorrect);

8
src/xrpld/app/ledger/detail/InboundLedger.cpp
View File

@@ -129,7 +129,7 @@ InboundLedger::init(ScopedLockType& collectionLock)
JLOG(journal_.debug()) << "Acquiring ledger we already have in "
<< " local store. " << hash_;
XRPL_ASSERT(
mLedger->header().seq < XRP_LEDGER_EARLIEST_FEES || mLedger->read(keylet::fees()),
mLedger->header().seq < XRP_LEDGER_EARLIEST_FEES || mLedger->read(keylet::feeSettings()),
"xrpl::InboundLedger::init : valid ledger fees");
mLedger->setImmutable();
@@ -352,7 +352,8 @@ InboundLedger::tryDB(NodeStore::Database& srcDB)
JLOG(journal_.debug()) << "Had everything locally";
complete_ = true;
XRPL_ASSERT(
mLedger->header().seq < XRP_LEDGER_EARLIEST_FEES || mLedger->read(keylet::fees()),
mLedger->header().seq < XRP_LEDGER_EARLIEST_FEES ||
mLedger->read(keylet::feeSettings()),
"xrpl::InboundLedger::tryDB : valid ledger fees");
mLedger->setImmutable();
}
@@ -448,7 +449,8 @@ InboundLedger::done()
if (complete_ && !failed_ && mLedger)
{
XRPL_ASSERT(
mLedger->header().seq < XRP_LEDGER_EARLIEST_FEES || mLedger->read(keylet::fees()),
mLedger->header().seq < XRP_LEDGER_EARLIEST_FEES ||
mLedger->read(keylet::feeSettings()),
"xrpl::InboundLedger::done : valid ledger fees");
mLedger->setImmutable();
switch (mReason)

2
src/xrpld/app/ledger/detail/LedgerPersistence.cpp
View File

@@ -120,7 +120,7 @@ finishLoadByIndexOrHash(std::shared_ptr<Ledger> const& ledger, beast::Journal j)
return;
XRPL_ASSERT(
ledger->header().seq < XRP_LEDGER_EARLIEST_FEES || ledger->read(keylet::fees()),
ledger->header().seq < XRP_LEDGER_EARLIEST_FEES || ledger->read(keylet::feeSettings()),
"xrpl::finishLoadByIndexOrHash : valid ledger fees");
ledger->setImmutable();

7
src/xrpld/app/main/Application.cpp
View File

@@ -1715,7 +1715,7 @@ ApplicationImp::startGenesisLedger()
auto const next = std::make_shared<Ledger>(*genesis, getTimeKeeper().closeTime());
next->updateSkipList();
XRPL_ASSERT(
next->header().seq < XRP_LEDGER_EARLIEST_FEES || next->read(keylet::fees()),
next->header().seq < XRP_LEDGER_EARLIEST_FEES || next->read(keylet::feeSettings()),
"xrpl::ApplicationImp::startGenesisLedger : valid ledger fees");
next->setImmutable();
openLedger_.emplace(next, cachedSLEs_, logs_->journal("OpenLedger"));
@@ -1737,7 +1737,7 @@ ApplicationImp::getLastFullLedger()
return ledger;
XRPL_ASSERT(
ledger->header().seq < XRP_LEDGER_EARLIEST_FEES || ledger->read(keylet::fees()),
ledger->header().seq < XRP_LEDGER_EARLIEST_FEES || ledger->read(keylet::feeSettings()),
"xrpl::ApplicationImp::getLastFullLedger : valid ledger fees");
ledger->setImmutable();
@@ -1888,7 +1888,8 @@ ApplicationImp::loadLedgerFromFile(std::string const& name)
loadLedger->stateMap().flushDirty(NodeObjectType::hotACCOUNT_NODE);
XRPL_ASSERT(
loadLedger->header().seq < XRP_LEDGER_EARLIEST_FEES || loadLedger->read(keylet::fees()),
loadLedger->header().seq < XRP_LEDGER_EARLIEST_FEES ||
loadLedger->read(keylet::feeSettings()),
"xrpl::ApplicationImp::loadLedgerFromFile : valid ledger fees");
loadLedger->setAccepted(closeTime, closeTimeResolution, !closeTimeEstimated);

4
src/xrpld/rpc/handlers/ledger/LedgerEntry.cpp
View File

@@ -82,7 +82,7 @@ parseIndex(Json::Value const& params, Json::StaticString const fieldName, unsign
if (index == jss::amendments.c_str())
return keylet::amendments().key;
if (index == jss::fee.c_str())
return keylet::fees().key;
return keylet::feeSettings().key;
if (index == jss::nunl)
return keylet::negativeUNL().key;
if (index == jss::hashes)
@@ -434,7 +434,7 @@ parseEscrow(
return keylet::escrow(*id, *seq).key;
}
auto const parseFeeSettings = fixed(keylet::fees());
auto const parseFeeSettings = fixed(keylet::feeSettings());
static Expected<uint256, Json::Value>
parseFixed(