chain: move new settings safely in overwriteRwSetting

ismaelsadeeq · Sep 5, 2024 · 1e9e735 · 1e9e735
1 parent 1c40900
commit 1e9e735
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
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);
         }
     }