wallet: Swap order of Unload and Close on shutdown

StopWallets, now renamed to CloseWallets, was being called prior to
UnloadWallets, which does not entirely make sense as UnloadWallets does
additional database cleanups.

UnloadWallets is now called first, then CloseWallets.

Author: achow101

src/wallet/interfaces.cpp

@@ -572,7 +572,7 @@ class WalletLoaderImpl : public WalletLoader
         m_context.chain = &chain;
         m_context.args = &args;
     }
-    ~WalletLoaderImpl() override { UnloadWallets(m_context); }
+    ~WalletLoaderImpl() override { CloseWallets(m_context); }
 
     //! ChainClient methods
     void registerRpcs() override
@@ -594,7 +594,7 @@ class WalletLoaderImpl : public WalletLoader
         return StartWallets(m_context);
     }
     void flush() override { return FlushWallets(m_context); }
-    void stop() override { return StopWallets(m_context); }
+    void stop() override { return UnloadWallets(m_context); }
     void setMockTime(int64_t time) override { return SetMockTime(time); }
     void schedulerMockForward(std::chrono::seconds delta) override { Assert(m_context.scheduler)->MockForward(delta); }
 

src/wallet/load.cpp

@@ -173,7 +173,7 @@ void FlushWallets(WalletContext& context)
     }
 }
 
-void StopWallets(WalletContext& context)
+void CloseWallets(WalletContext& context)
 {
     for (const std::shared_ptr<CWallet>& pwallet : GetWallets(context)) {
         pwallet->Close();

src/wallet/load.h

@@ -31,10 +31,10 @@ void StartWallets(WalletContext& context);
 //! Flush all wallets in preparation for shutdown.
 void FlushWallets(WalletContext& context);
 
-//! Stop all wallets. Wallets will be flushed first.
-void StopWallets(WalletContext& context);
+//! Close all wallet databases.
+void CloseWallets(WalletContext& context);
 
-//! Close all wallets.
+//! Flush and unload all wallets.
 void UnloadWallets(WalletContext& context);
 } // namespace wallet