ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Persist API-configured voting settings:

Browse Source 
Prior to this commit, the amendments that a server would vote in support
of or against could be configured both via the configuration file and
via the command line "feature" command. Changes made in the configuration
file would only be loaded once at server startup and changes made via the
command line take effect immediately but are not persisted across
restarts.

This commit deprecates management of amendments via the configuration
file and stores the relevant information in the `wallet.db` database
file.

1. On startup, the new code parses the configuration file.
2. If the `[veto_amendments]` or `[amendments]` sections are present,
   we check if the `FeatureVotes` table is present in `wallet.db`.
3. If it is not, we create the `FeatureVotes` table and transfer the
   settings from the config file.
4. Proceed normally but only reference the `FeatureVotes` table instead
   of the config file.
5. Warns if the voting table already exists in `wallet.db` and there
   exists voting sections in the config file. The config file is ignored
   in this case.

This change addresses & closes #3366
This commit is contained in:
Howard Hinnant
2020-08-06 10:32:33 -04:00
committed by Nik Bougalis
parent 24b17c6de9
commit 28ed2b9e69
4 changed files with 225 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
src/test/app/AmendmentTable_test.cpp
View File

@@ -51,14 +51,22 @@ private:
}
static Section
makeSection(std::vector<std::string> const& amendments)
makeSection(
std::string const& name,
std::vector<std::string> const& amendments)
{
Section section("Test");
Section section(name);
for (auto const& a : amendments)
section.append(to_string(amendmentId(a)) + " " + a);
return section;
}
static Section
makeSection(std::vector<std::string> const& amendments)
{
return makeSection("Test", amendments);
}
static Section
makeSection(uint256 const& amendment)
{
@@ -67,6 +75,17 @@ private:
return section;
}
std::unique_ptr<Config>
makeConfig()
{
auto cfg = test::jtx::envconfig();
cfg->section(SECTION_AMENDMENTS) =
makeSection(SECTION_AMENDMENTS, enabled_);
cfg->section(SECTION_VETO_AMENDMENTS) =
makeSection(SECTION_VETO_AMENDMENTS, vetoed_);
return cfg;
}
// All useful amendments are supported amendments.
// Enabled amendments are typically a subset of supported amendments.
// Vetoed amendments should be supported but not enabled.
@@ -91,19 +110,32 @@ public:
std::unique_ptr<AmendmentTable>
makeTable(
Application& app,
std::chrono::seconds majorityTime,
Section const supported,
Section const enabled,
Section const vetoed)
Section const& supported,
Section const& enabled,
Section const& vetoed)
{
return make_AmendmentTable(
majorityTime, supported, enabled, vetoed, journal);
app, majorityTime, supported, enabled, vetoed, journal);
}
std::unique_ptr<AmendmentTable>
makeTable(std::chrono::seconds majorityTime)
makeTable(
test::jtx::Env& env,
std::chrono::seconds majorityTime,
Section const& supported,
Section const& enabled,
Section const& vetoed)
{
return makeTable(env.app(), majorityTime, supported, enabled, vetoed);
}
std::unique_ptr<AmendmentTable>
makeTable(test::jtx::Env& env, std::chrono::seconds majorityTime)
{
return makeTable(
env.app(),
majorityTime,
makeSection(supported_),
makeSection(enabled_),
@@ -114,8 +146,8 @@ public:
testConstruct()
{
testcase("Construction");
auto table = makeTable(weeks(1));
test::jtx::Env env{*this, makeConfig()};
auto table = makeTable(env, weeks(1));
for (auto const& a : supported_)
{
@@ -125,7 +157,6 @@ public:
for (auto const& a : enabled_)
{
BEAST_EXPECT(table->isSupported(amendmentId(a)));
BEAST_EXPECT(table->isEnabled(amendmentId(a)));
}
for (auto const& a : vetoed_)
@@ -140,7 +171,8 @@ public:
{
testcase("Name to ID mapping");
auto table = makeTable(weeks(1));
test::jtx::Env env{*this, makeConfig()};
auto table = makeTable(env, weeks(1));
for (auto const& a : supported_)
BEAST_EXPECT(table->find(a) == amendmentId(a));
@@ -186,7 +218,8 @@ public:
try
{
if (makeTable(weeks(2), test, emptySection, emptySection))
test::jtx::Env env{*this, makeConfig()};
if (makeTable(env, weeks(2), test, emptySection, emptySection))
fail("Accepted only amendment ID");
}
catch (...)
@@ -201,7 +234,8 @@ public:
try
{
if (makeTable(weeks(2), test, emptySection, emptySection))
test::jtx::Env env{*this, makeConfig()};
if (makeTable(env, weeks(2), test, emptySection, emptySection))
fail("Accepted extra arguments");
}
catch (...)
@@ -219,7 +253,8 @@ public:
try
{
if (makeTable(weeks(2), test, emptySection, emptySection))
test::jtx::Env env{*this, makeConfig()};
if (makeTable(env, weeks(2), test, emptySection, emptySection))
fail("Accepted short amendment ID");
}
catch (...)
@@ -237,7 +272,8 @@ public:
try
{
if (makeTable(weeks(2), test, emptySection, emptySection))
test::jtx::Env env{*this, makeConfig()};
if (makeTable(env, weeks(2), test, emptySection, emptySection))
fail("Accepted long amendment ID");
}
catch (...)
@@ -256,7 +292,8 @@ public:
try
{
if (makeTable(weeks(2), test, emptySection, emptySection))
test::jtx::Env env{*this, makeConfig()};
if (makeTable(env, weeks(2), test, emptySection, emptySection))
fail("Accepted non-hex amendment ID");
}
catch (...)
@@ -271,28 +308,24 @@ public:
{
testcase("enable and veto");
std::unique_ptr<AmendmentTable> table = makeTable(weeks(2));
test::jtx::Env env{*this, makeConfig()};
std::unique_ptr<AmendmentTable> table = makeTable(env, weeks(2));
// Note which entries are pre-enabled.
// Note which entries are enabled.
std::set<uint256> allEnabled;
for (std::string const& a : enabled_)
allEnabled.insert(amendmentId(a));
// Subset of amendments to late-enable
std::set<uint256> lateEnabled;
lateEnabled.insert(amendmentId(supported_[0]));
lateEnabled.insert(amendmentId(enabled_[0]));
lateEnabled.insert(amendmentId(vetoed_[0]));
// Subset of amendments to enable
allEnabled.insert(amendmentId(supported_[0]));
allEnabled.insert(amendmentId(enabled_[0]));
allEnabled.insert(amendmentId(vetoed_[0]));
// Do the late enabling.
for (uint256 const& a : lateEnabled)
for (uint256 const& a : allEnabled)
table->enable(a);
// So far all enabled amendments are supported.
BEAST_EXPECT(!table->hasUnsupportedEnabled());
// Verify all pre- and late-enables are enabled and nothing else.
allEnabled.insert(lateEnabled.begin(), lateEnabled.end());
// Verify all enables are enabled and nothing else.
for (std::string const& a : supported_)
{
uint256 const supportedID = amendmentId(a);
@@ -470,8 +503,9 @@ public:
auto const testAmendment = amendmentId("TestAmendment");
auto const validators = makeValidators(10);
test::jtx::Env env{*this};
auto table =
makeTable(weeks(2), emptySection, emptySection, emptySection);
makeTable(env, weeks(2), emptySection, emptySection, emptySection);
std::vector<std::pair<uint256, int>> votes;
std::vector<uint256> ourVotes;
@@ -530,8 +564,13 @@ public:
auto const testAmendment = amendmentId("vetoedAmendment");
test::jtx::Env env{*this};
auto table = makeTable(
weeks(2), emptySection, emptySection, makeSection(testAmendment));
env,
weeks(2),
emptySection,
emptySection,
makeSection(testAmendment));
auto const validators = makeValidators(10);
@@ -588,8 +627,9 @@ public:
{
testcase("voteEnable");
test::jtx::Env env{*this};
auto table = makeTable(
weeks(2), makeSection(supported_), emptySection, emptySection);
env, weeks(2), makeSection(supported_), emptySection, emptySection);
auto const validators = makeValidators(10);
std::vector<std::pair<uint256, int>> votes;
@@ -667,8 +707,13 @@ public:
testcase("detectMajority");
auto const testAmendment = amendmentId("detectMajority");
test::jtx::Env env{*this};
auto table = makeTable(
weeks(2), makeSection(testAmendment), emptySection, emptySection);
env,
weeks(2),
makeSection(testAmendment),
emptySection,
emptySection);
auto const validators = makeValidators(16);
@@ -733,8 +778,13 @@ public:
auto const testAmendment = amendmentId("lostMajority");
auto const validators = makeValidators(16);
test::jtx::Env env{*this};
auto table = makeTable(
weeks(8), makeSection(testAmendment), emptySection, emptySection);
env,
weeks(8),
makeSection(testAmendment),
emptySection,
emptySection);
std::set<uint256> enabled;
majorityAmendments_t majority;
@@ -800,12 +850,10 @@ public:
{
testcase("hasUnsupportedEnabled");
test::jtx::Env env(*this); // Used only for its Rules
env.close();
using namespace std::chrono_literals;
weeks constexpr w(1);
auto table = makeTable(w);
test::jtx::Env env{*this, makeConfig()};
auto table = makeTable(env, w);
BEAST_EXPECT(!table->hasUnsupportedEnabled());
BEAST_EXPECT(!table->firstUnsupportedExpected());
BEAST_EXPECT(table->needValidatedLedger(1));