mirror of
https://github.com/XRPLF/rippled.git
synced 2026-08-23 15:20:54 +00:00
Refactor fee initialization and configuration: (#4319)
* Create the FeeSettings object in genesis ledger. * Initialize with default values from the config. Removes the need to pass a Config down into the Ledger initialization functions, including setup(). * Drop the undocumented fee config settings in favor of the [voting] section. * Fix #3734. * If you previously used fee_account_reserve and/or fee_owner_reserve, you should change to using the [voting] section instead. Example: ``` [voting] account_reserve=10000000 owner_reserve=2000000 ``` * Because old Mainnet ledgers (prior to 562177 - yes, I looked it up) don't have FeeSettings, some of the other ctors will default them to the config values before setup() tries to load the object. * Update default Config fee values to match Mainnet. * Fix unit tests: * Updated fees: Some tests are converted to use computed values of fee object, but the default Env config was also updated to fix the rest. * Unit tests that check the structure of the ledger have updated hashes and counts.
This commit is contained in:
@@ -2079,7 +2079,8 @@ public:
|
||||
BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "100");
|
||||
jrr = ledgerEntryRoot(env, alice);
|
||||
BEAST_EXPECT(
|
||||
jrr[jss::node][sfBalance.fieldName] == XRP(350).value().getText());
|
||||
jrr[jss::node][sfBalance.fieldName] ==
|
||||
STAmount(env.current()->fees().accountReserve(3)).getText());
|
||||
|
||||
jrr = ledgerEntryState(env, bob, gw1, "USD");
|
||||
BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "-400");
|
||||
@@ -2176,7 +2177,8 @@ public:
|
||||
BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "-100");
|
||||
jrr = ledgerEntryRoot(env, alice);
|
||||
BEAST_EXPECT(
|
||||
jrr[jss::node][sfBalance.fieldName] == XRP(250).value().getText());
|
||||
jrr[jss::node][sfBalance.fieldName] ==
|
||||
STAmount(env.current()->fees().accountReserve(1)).getText());
|
||||
|
||||
jrr = ledgerEntryState(env, bob, gw, "USD");
|
||||
BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "-400");
|
||||
@@ -2219,7 +2221,8 @@ public:
|
||||
BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "-200");
|
||||
jrr = ledgerEntryRoot(env, alice);
|
||||
BEAST_EXPECT(
|
||||
jrr[jss::node][sfBalance.fieldName] == XRP(250).value().getText());
|
||||
jrr[jss::node][sfBalance.fieldName] ==
|
||||
STAmount(env.current()->fees().accountReserve(1)).getText());
|
||||
|
||||
jrr = ledgerEntryState(env, bob, gw, "USD");
|
||||
BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "-300");
|
||||
|
||||
Reference in New Issue
Block a user