mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-13 15:39:05 +01:00
Migrate -upnp and -natpmp settings from QSettings to settings.json
This also effectively reverts 58e8364dcd from
#18077, applying upnp and natpmp settings from the optionsmodel class instead
of the optionsdialog class. This makes sense because model code, not view code
is responsible for applying all other settings, and because leaving these
settings half-applied in optionsmodel seems error prone and could lead to bugs.
(These things were discussed a little in
https://github.com/bitcoin/bitcoin/pull/18077#discussion_r560381734)
This commit is contained in:
@@ -34,6 +34,7 @@ void OptionTests::migrateSettings()
|
||||
QSettings settings;
|
||||
settings.setValue("nDatabaseCache", 600);
|
||||
settings.setValue("nThreadsScriptVerif", 12);
|
||||
settings.setValue("fUseUPnP", false);
|
||||
|
||||
settings.sync();
|
||||
|
||||
@@ -42,6 +43,7 @@ void OptionTests::migrateSettings()
|
||||
QVERIFY(options.Init(error));
|
||||
QVERIFY(!settings.contains("nDatabaseCache"));
|
||||
QVERIFY(!settings.contains("nThreadsScriptVerif"));
|
||||
QVERIFY(!settings.contains("fUseUPnP"));
|
||||
|
||||
std::ifstream file(gArgs.GetDataDirNet() / "settings.json");
|
||||
QCOMPARE(std::string(std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>()).c_str(), "{\n"
|
||||
|
||||
Reference in New Issue
Block a user