ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add units to all fee calculations:

Browse Source 
* Uses existing XRPAmount with units for drops, and a new TaggedFee for
  fee units (LoadFeeTrack), and fee levels (TxQ).
* Resolves #2451
This commit is contained in:
Edward Hennis
2019-02-14 18:59:07 -05:00
parent 1901b981f3
commit e3b5b808c5
87 changed files with 2195 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/test/app/Check_test.cpp
View File

@@ -305,7 +305,7 @@ class Check_test : public beast::unit_test::suite
BEAST_EXPECT (checksOnAccount (env, bob ).size() == bobCount + 6);
// alice uses multisigning to create a check.
std::uint64_t const baseFeeDrops {env.current()->fees().base};
XRPAmount const baseFeeDrops {env.current()->fees().base};
env (check::create (alice, bob, USD(50)),
msig (bogie, demon), fee (3 * baseFeeDrops));
env.close();
@@ -511,7 +511,7 @@ class Check_test : public beast::unit_test::suite
fix1449Time() + 100 * env.closed()->info().closeTimeResolution;
env.close (closeTime);
std::uint64_t const baseFeeDrops {env.current()->fees().base};
XRPAmount const baseFeeDrops {env.current()->fees().base};
STAmount const startBalance {XRP(300).value()};
env.fund (startBalance, alice, bob);
{
@@ -601,7 +601,7 @@ class Check_test : public beast::unit_test::suite
verifyDeliveredAmount (env, drops(checkAmount.mantissa() - 1));
env.require (balance (alice, reserve));
env.require (balance (bob,
startBalance + checkAmount - drops ((baseFeeDrops * 2) + 1)));
startBalance + checkAmount - drops (baseFeeDrops * 2 + 1)));
BEAST_EXPECT (checksOnAccount (env, alice).size() == 0);
BEAST_EXPECT (checksOnAccount (env, bob ).size() == 0);
BEAST_EXPECT (ownerCount (env, alice) == 0);
@@ -611,7 +611,7 @@ class Check_test : public beast::unit_test::suite
env (pay (env.master, alice,
checkAmount + drops (baseFeeDrops - 1)));
env (pay (bob, env.master,
checkAmount - drops ((baseFeeDrops * 3) + 1)));
checkAmount - drops (baseFeeDrops * 3 + 1)));
env.close();
env.require (balance (alice, startBalance));
env.require (balance (bob, startBalance));
@@ -947,7 +947,7 @@ class Check_test : public beast::unit_test::suite
BEAST_EXPECT (ownerCount (env, bob ) == signersCount + 1);
// bob uses multisigning to cash a check.
std::uint64_t const baseFeeDrops {env.current()->fees().base};
XRPAmount const baseFeeDrops {env.current()->fees().base};
env (check::cash (bob, chkId2, (USD(2))),
msig (bogie, demon), fee (3 * baseFeeDrops));
env.close();
@@ -1677,7 +1677,7 @@ class Check_test : public beast::unit_test::suite
BEAST_EXPECT (ownerCount (env, alice) == signersCount + 3);
// alice uses multisigning to cancel a check.
std::uint64_t const baseFeeDrops {env.current()->fees().base};
XRPAmount const baseFeeDrops {env.current()->fees().base};
env (check::cancel (alice, chkIdMSig),
msig (bogie, demon), fee (3 * baseFeeDrops));
env.close();