[FOLD, maybe] Rename the new SFields from *XRP to *Drops

XRPLF · Dec 16, 2022 · fa94a73 · fa94a73
1 parent 36b634e
commit fa94a73
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 39 deletions.
diff --git a/src/ripple/app/ledger/Ledger.cpp b/src/ripple/app/ledger/Ledger.cpp
@@ -627,10 +627,10 @@ Ledger::setup(Config const& config)
                 oldFees = baseFee || reserveBase || reserveIncrement;
             }
             {
-                auto const baseFeeXRP = sle->at(~sfBaseFeeXRP);
-                auto const reserveBaseXRP = sle->at(~sfReserveBaseXRP);
+                auto const baseFeeXRP = sle->at(~sfBaseFeeDrops);
+                auto const reserveBaseXRP = sle->at(~sfReserveBaseDrops);
                 auto const reserveIncrementXRP =
-                    sle->at(~sfReserveIncrementXRP);
+                    sle->at(~sfReserveIncrementDrops);
                 auto assign = [&ret](
                                   XRPAmount& dest,
                                   std::optional<STAmount> const& src) {

diff --git a/src/ripple/app/misc/FeeVoteImpl.cpp b/src/ripple/app/misc/FeeVoteImpl.cpp
@@ -141,17 +141,17 @@ FeeVoteImpl::doValidation(
                 v[sfield] = target;
             }
         };
-        vote(lastFees.base, target_.reference_fee, "base fee", sfBaseFeeXRP);
+        vote(lastFees.base, target_.reference_fee, "base fee", sfBaseFeeDrops);
         vote(
             lastFees.accountReserve(0),
             target_.account_reserve,
             "base reserve",
-            sfReserveBaseXRP);
+            sfReserveBaseDrops);
         vote(
             lastFees.increment,
             target_.owner_reserve,
             "reserve increment",
-            sfReserveIncrementXRP);
+            sfReserveIncrementDrops);
     }
     else
     {
@@ -236,9 +236,9 @@ FeeVoteImpl::doVoting(
         {
             if (!val->isTrusted())
                 continue;
-            doVote(val, baseFeeVote, sfBaseFeeXRP);
-            doVote(val, baseReserveVote, sfReserveBaseXRP);
-            doVote(val, incReserveVote, sfReserveIncrementXRP);
+            doVote(val, baseFeeVote, sfBaseFeeDrops);
+            doVote(val, baseReserveVote, sfReserveBaseDrops);
+            doVote(val, incReserveVote, sfReserveIncrementDrops);
         }
     }
     else

diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp
@@ -2182,16 +2182,16 @@ NetworkOPsImp::pubValidation(std::shared_ptr<STValidation> const& val)
 
         // (The ~ operator converts the Proxy to a std::optional, which
         //  simplifies later operations)
-        if (auto const baseFeeXRP = ~val->at(~sfBaseFeeXRP);
+        if (auto const baseFeeXRP = ~val->at(~sfBaseFeeDrops);
             baseFeeXRP && baseFeeXRP->native())
             jvObj[jss::base_fee_drops] = baseFeeXRP->xrp().jsonClipped();
 
-        if (auto const reserveBaseXRP = ~val->at(~sfReserveBaseXRP);
+        if (auto const reserveBaseXRP = ~val->at(~sfReserveBaseDrops);
             reserveBaseXRP && reserveBaseXRP->native())
             jvObj[jss::reserve_base_drops] =
                 reserveBaseXRP->xrp().jsonClipped();
 
-        if (auto const reserveIncXRP = ~val->at(~sfReserveIncrementXRP);
+        if (auto const reserveIncXRP = ~val->at(~sfReserveIncrementDrops);
             reserveIncXRP && reserveIncXRP->native())
             jvObj[jss::reserve_inc_drops] = reserveIncXRP->xrp().jsonClipped();
 

diff --git a/src/ripple/app/tx/impl/Change.cpp b/src/ripple/app/tx/impl/Change.cpp
@@ -93,9 +93,9 @@ Change::preclaim(PreclaimContext const& ctx)
         case ttFEE:
             if (ctx.view.rules().enabled(featureXRPFees))
             {
-                if (!ctx.tx.isFieldPresent(sfBaseFeeXRP) ||
-                    !ctx.tx.isFieldPresent(sfReserveBaseXRP) ||
-                    !ctx.tx.isFieldPresent(sfReserveIncrementXRP))
+                if (!ctx.tx.isFieldPresent(sfBaseFeeDrops) ||
+                    !ctx.tx.isFieldPresent(sfReserveBaseDrops) ||
+                    !ctx.tx.isFieldPresent(sfReserveIncrementDrops))
                     return temMALFORMED;
                 // The transaction should only have one set of fields or the
                 // other.
@@ -119,9 +119,9 @@ Change::preclaim(PreclaimContext const& ctx)
                     return temMALFORMED;
                 // The transaction should only have one or the other. If the new
                 // fields are present without the amendment, that's bad, too.
-                if (ctx.tx.isFieldPresent(sfBaseFeeXRP) ||
-                    ctx.tx.isFieldPresent(sfReserveBaseXRP) ||
-                    ctx.tx.isFieldPresent(sfReserveIncrementXRP))
+                if (ctx.tx.isFieldPresent(sfBaseFeeDrops) ||
+                    ctx.tx.isFieldPresent(sfReserveBaseDrops) ||
+                    ctx.tx.isFieldPresent(sfReserveIncrementDrops))
                     return temDISABLED;
             }
             return tesSUCCESS;
@@ -354,9 +354,9 @@ Change::applyFee()
     };
     if (view().rules().enabled(featureXRPFees))
     {
-        set(feeObject, ctx_.tx, sfBaseFeeXRP);
-        set(feeObject, ctx_.tx, sfReserveBaseXRP);
-        set(feeObject, ctx_.tx, sfReserveIncrementXRP);
+        set(feeObject, ctx_.tx, sfBaseFeeDrops);
+        set(feeObject, ctx_.tx, sfReserveBaseDrops);
+        set(feeObject, ctx_.tx, sfReserveIncrementDrops);
         // Ensure the old fields are removed
         feeObject->makeFieldAbsent(sfBaseFee);
         feeObject->makeFieldAbsent(sfReferenceFeeUnits);

diff --git a/src/ripple/protocol/SField.h b/src/ripple/protocol/SField.h
@@ -484,9 +484,9 @@ extern SF_AMOUNT const sfDeliveredAmount;
 extern SF_AMOUNT const sfNFTokenBrokerFee;
 
 // currency amount (fees)
-extern SF_AMOUNT const sfBaseFeeXRP;
-extern SF_AMOUNT const sfReserveBaseXRP;
-extern SF_AMOUNT const sfReserveIncrementXRP;
+extern SF_AMOUNT const sfBaseFeeDrops;
+extern SF_AMOUNT const sfReserveBaseDrops;
+extern SF_AMOUNT const sfReserveIncrementDrops;
 
 // variable length (common)
 extern SF_VL const sfPublicKey;

diff --git a/src/ripple/protocol/impl/LedgerFormats.cpp b/src/ripple/protocol/impl/LedgerFormats.cpp
@@ -152,9 +152,9 @@ LedgerFormats::LedgerFormats()
             {sfReserveBase,          soeOPTIONAL},
             {sfReserveIncrement,     soeOPTIONAL},
             // New version uses Amounts
-            {sfBaseFeeXRP,           soeOPTIONAL},
-            {sfReserveBaseXRP,       soeOPTIONAL},
-            {sfReserveIncrementXRP,  soeOPTIONAL},
+            {sfBaseFeeDrops,           soeOPTIONAL},
+            {sfReserveBaseDrops,       soeOPTIONAL},
+            {sfReserveIncrementDrops,  soeOPTIONAL},
         },
         commonFields);
 

diff --git a/src/ripple/protocol/impl/SField.cpp b/src/ripple/protocol/impl/SField.cpp
@@ -235,9 +235,9 @@ CONSTRUCT_TYPED_SFIELD(sfDeliveredAmount,       "DeliveredAmount",      AMOUNT,
 CONSTRUCT_TYPED_SFIELD(sfNFTokenBrokerFee,      "NFTokenBrokerFee",     AMOUNT,    19);
 
 // currency amount (fees)
-CONSTRUCT_TYPED_SFIELD(sfBaseFeeXRP,            "BaseFeeXRP",           AMOUNT,    20);
-CONSTRUCT_TYPED_SFIELD(sfReserveBaseXRP,        "ReserveBaseXRP",       AMOUNT,    21);
-CONSTRUCT_TYPED_SFIELD(sfReserveIncrementXRP,   "ReserveIncrementXRP",  AMOUNT,    22);
+CONSTRUCT_TYPED_SFIELD(sfBaseFeeDrops,            "BaseFeeDrops",           AMOUNT,    20);
+CONSTRUCT_TYPED_SFIELD(sfReserveBaseDrops,        "ReserveBaseDrops",       AMOUNT,    21);
+CONSTRUCT_TYPED_SFIELD(sfReserveIncrementDrops,   "ReserveIncrementDrops",  AMOUNT,    22);
 
 // variable length (common)
 CONSTRUCT_TYPED_SFIELD(sfPublicKey,             "PublicKey",            VL,         1);

diff --git a/src/ripple/protocol/impl/STValidation.cpp b/src/ripple/protocol/impl/STValidation.cpp
@@ -63,9 +63,9 @@ STValidation::validationFormat()
         {sfValidatedHash,       soeOPTIONAL},
         {sfServerVersion,       soeOPTIONAL},
         // featureXRPFees
-        {sfBaseFeeXRP,          soeOPTIONAL},
-        {sfReserveBaseXRP,      soeOPTIONAL},
-        {sfReserveIncrementXRP, soeOPTIONAL},
+        {sfBaseFeeDrops,          soeOPTIONAL},
+        {sfReserveBaseDrops,      soeOPTIONAL},
+        {sfReserveIncrementDrops, soeOPTIONAL},
     };
     // clang-format on
 

diff --git a/src/ripple/protocol/impl/TxFormats.cpp b/src/ripple/protocol/impl/TxFormats.cpp
@@ -161,9 +161,9 @@ TxFormats::TxFormats()
             {sfReserveBase, soeOPTIONAL},
             {sfReserveIncrement, soeOPTIONAL},
             // New version uses Amounts
-            {sfBaseFeeXRP, soeOPTIONAL},
-            {sfReserveBaseXRP, soeOPTIONAL},
-            {sfReserveIncrementXRP, soeOPTIONAL},
+            {sfBaseFeeDrops, soeOPTIONAL},
+            {sfReserveBaseDrops, soeOPTIONAL},
+            {sfReserveIncrementDrops, soeOPTIONAL},
         },
         commonFields);
 

diff --git a/src/test/app/PseudoTx_test.cpp b/src/test/app/PseudoTx_test.cpp
@@ -37,9 +37,9 @@ struct PseudoTx_test : public beast::unit_test::suite
             obj[sfLedgerSequence] = seq;
             if (rules.enabled(featureXRPFees))
             {
-                obj[sfBaseFeeXRP] = XRPAmount{0};
-                obj[sfReserveBaseXRP] = XRPAmount{0};
-                obj[sfReserveIncrementXRP] = XRPAmount{0};
+                obj[sfBaseFeeDrops] = XRPAmount{0};
+                obj[sfReserveBaseDrops] = XRPAmount{0};
+                obj[sfReserveIncrementDrops] = XRPAmount{0};
             }
             else
             {