ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-27 22:45:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

More test and logging updates

Browse Source
This commit is contained in:
Ed Hennis
2025-11-19 18:24:19 -05:00
parent bd9346aea9
commit 3b421cdb69
4 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/xrpl/basics/Number.h
View File

@@ -45,10 +45,11 @@ class Number
// of -maxMantissa to maxMantissa. Values larger than this will be
// truncated before the decimal point, rendering the value inaccurate.
// 3. In "operator rep()", which explicitly converts the number into a
// 64-bit integer, if the Number is not representable(), AND one of the
// SingleAssetVault (or LendingProtocol, coming soon) amendments are
// enabled, the operator will throw a "std::overflow_error" as if the
// number had overflowed the limits of the 64-bit integer range.
// 64-bit integer, if the integer value grows larger than maxMantissa
// while it's being computed, AND one of the SingleAssetVault (or
// LendingProtocol, coming soon) amendments are enabled, the operator
// will throw a "std::overflow_error" as if the number had overflowed the
// limits of the 64-bit integer range.
//
// The Number is usually only going to be checked in transactions, based on
// the specific transaction logic, and is entirely context dependent.
@@ -159,10 +160,11 @@ public:
* "mixed mode" more convenient, e.g. MPTAmount + Number.
3. In "operator rep()", which explicitly converts the number into a
64-bit integer, if the Number is not representable(), AND one of the
SingleAssetVault (or LendingProtocol, coming soon) amendments are
enabled, the operator will throw a "std::overflow_error" as if the
number had overflowed the limits of the 64-bit integer range.
64-bit integer, if the integer value grows larger than maxMantissa
while it's being computed, AND one of the SingleAssetVault (or
LendingProtocol, coming soon) amendments are enabled, the operator
will throw a "std::overflow_error" as if the number had overflowed
the limits of the 64-bit integer range.
*/
explicit
operator rep() const; // round to nearest, even on tie

9
src/test/app/Vault_test.cpp
View File

@@ -970,17 +970,17 @@ class Vault_test : public beast::unit_test::suite
env(tx, ter(temMALFORMED));
}
// accepted range from 0 to 13
// accepted range from 0 to 15
{
auto [tx, keylet] =
vault.create({.owner = owner, .asset = asset});
tx[sfScale] = 13;
tx[sfScale] = 15;
env(tx);
env.close();
auto const sleVault = env.le(keylet);
if (!BEAST_EXPECT(sleVault))
return;
BEAST_EXPECT((*sleVault)[sfScale] == 13);
BEAST_EXPECT((*sleVault)[sfScale] == 15);
}
{
@@ -3696,7 +3696,8 @@ class Vault_test : public beast::unit_test::suite
testCase(15, [&, this](Env& env, Data d) {
testcase("MPT fractional deposits are supported");
// Deposits large than Number::maxIntValue are invalid
// Deposits that result in share amounts larger than
// Number::maxIntValue are invalid
{
auto tx = d.vault.deposit(
{.depositor = d.depositor,

14
src/test/basics/Number_test.cpp
View File

@@ -761,6 +761,7 @@ public:
BEAST_EXPECT(!a.getLimited());
BEAST_EXPECT(a.fits());
BEAST_EXPECT(a.representable());
checkInt(a, -100);
// If there's any interaction with an integer, the value
// becomes an integer. This is not always what the value is
// being used for, so it's up to the context to check or not
@@ -769,59 +770,72 @@ public:
BEAST_EXPECT(a.getLimited());
BEAST_EXPECT(a.fits());
BEAST_EXPECT(a.representable());
checkInt(a, 3600);
}
{
Number a{100, true};
BEAST_EXPECT(a.getLimited());
BEAST_EXPECT(a.fits());
BEAST_EXPECT(a.representable());
checkInt(a, 100);
a = Number{1, 15};
BEAST_EXPECT(!a.fits());
BEAST_EXPECT(a.representable());
checkInt(a, 1'000'000'000'000'000);
// The false in the assigned value does not override the
// flag in "a"
a = Number{1, 30, false};
BEAST_EXPECT(a.getLimited());
BEAST_EXPECT(!a.fits());
BEAST_EXPECT(!a.representable());
checkInt(a, 0, "Number::operator rep() overflow");
a = -100;
BEAST_EXPECT(a.getLimited());
BEAST_EXPECT(a.fits());
BEAST_EXPECT(a.representable());
checkInt(a, -100);
a *= Number{1, 13};
BEAST_EXPECT(a.getLimited());
BEAST_EXPECT(!a.fits());
BEAST_EXPECT(a.representable());
checkInt(a, -1'000'000'000'000'000);
a *= Number{1, 3};
BEAST_EXPECT(a.getLimited());
BEAST_EXPECT(!a.fits());
BEAST_EXPECT(!a.representable());
checkInt(a, -1'000'000'000'000'000'000);
// Intermittent value precision can be lost, but the result
// will be rounded, so that's fine.
a /= Number{1, 5};
BEAST_EXPECT(a.getLimited());
BEAST_EXPECT(a.fits());
BEAST_EXPECT(a.representable());
checkInt(a, -10'000'000'000'000);
a = Number{1, 14} - 3;
BEAST_EXPECT(a.getLimited());
BEAST_EXPECT(a.fits());
BEAST_EXPECT(a.representable());
checkInt(a, 99'999'999'999'997);
a += 1;
BEAST_EXPECT(a.getLimited());
BEAST_EXPECT(a.fits());
BEAST_EXPECT(a.representable());
checkInt(a, 99'999'999'999'998);
++a;
BEAST_EXPECT(a.getLimited());
BEAST_EXPECT(a.fits());
BEAST_EXPECT(a.representable());
checkInt(a, 99'999'999'999'999);
a++;
BEAST_EXPECT(a.getLimited());
BEAST_EXPECT(!a.fits());
BEAST_EXPECT(a.representable());
checkInt(a, 100'000'000'000'000);
a = Number{5, true};
BEAST_EXPECT(a.getLimited());
BEAST_EXPECT(a.fits());
BEAST_EXPECT(a.representable());
checkInt(a, 5);
auto const maxInt = std::numeric_limits<std::int64_t>::max();
a = maxInt;

2
src/xrpld/app/tx/detail/VaultDeposit.cpp
View File

@@ -287,7 +287,7 @@ VaultDeposit::doApply()
{
// It's easy to hit this exception from Number with large enough
// Scale so we avoid spamming the log and only use debug here.
JLOG(j_.warn()) //
JLOG(j_.debug()) //
<< "VaultDeposit: integer overflow error in total assets with"
<< " scale=" << (int)vault->at(sfScale).value() //
<< ", assetsTotal=" << vault->at(sfAssetsTotal).value()