chain: move new settings safely in overwriteRwSetting

ismaelsadeeq · ismaelsadeeq · commit 1e9e735670f0 · 2024-09-05T21:18:17.000+01:00
diff --git a/src/interfaces/chain.h b/src/interfaces/chain.h
@@ -361,7 +361,7 @@ class Chain
     virtual bool updateRwSetting(const std::string& name, const SettingsUpdate& update_function) = 0;
 
     //! Replace a setting in <datadir>/settings.json with a new value.
-    virtual bool overwriteRwSetting(const std::string& name, common::SettingsValue& value, bool write = true) = 0;
+    virtual bool overwriteRwSetting(const std::string& name, common::SettingsValue value, bool write = true) = 0;
 
     //! Delete a given setting in <datadir>/settings.json.
     virtual bool deleteRwSettings(const std::string& name, bool write = true) = 0;
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
@@ -828,7 +828,7 @@ class ChainImpl : public Chain
         // Now dump value to disk if requested
         return *action == interfaces::SettingsAction::SKIP_WRITE || args().WriteSettingsFile();
     }
-    bool overwriteRwSetting(const std::string& name, common::SettingsValue& value, bool write) override
+    bool overwriteRwSetting(const std::string& name, common::SettingsValue value, bool write) override
     {
         if (value.isNull()) return deleteRwSettings(name, write);
         return updateRwSetting(name, [&](common::SettingsValue& settings) {
diff --git a/src/wallet/load.cpp b/src/wallet/load.cpp
@@ -69,7 +69,7 @@ bool VerifyWallets(WalletContext& context)
             // Pass write=false because no need to write file and probably
             // better not to. If unnamed wallet needs to be added next startup
             // and the setting is empty, this code will just run again.
-            chain.overwriteRwSetting("wallet", wallets, /*write=*/false);
+            chain.overwriteRwSetting("wallet", std::move(wallets), /*write=*/false);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -828,7 +828,7 @@ class ChainImpl : public Chain`
`828`	`828`	`// Now dump value to disk if requested`
`829`	`829`	`return *action == interfaces::SettingsAction::SKIP_WRITE \|\| args().WriteSettingsFile();`
`830`	`830`	`}`
`831`		`- bool overwriteRwSetting(const std::string& name, common::SettingsValue& value, bool write) override`
	`831`	`+ bool overwriteRwSetting(const std::string& name, common::SettingsValue value, bool write) override`
`832`	`832`	`{`
`833`	`833`	`if (value.isNull()) return deleteRwSettings(name, write);`
`834`	`834`	`return updateRwSetting(name, [&](common::SettingsValue& settings) {`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ bool VerifyWallets(WalletContext& context)`
`69`	`69`	`// Pass write=false because no need to write file and probably`
`70`	`70`	`// better not to. If unnamed wallet needs to be added next startup`
`71`	`71`	`// and the setting is empty, this code will just run again.`
`72`		`- chain.overwriteRwSetting("wallet", wallets, /write=/false);`
	`72`	`+ chain.overwriteRwSetting("wallet", std::move(wallets), /write=/false);`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`