[wallet] Add FlushWallets() function to wallet/init.cpp

cosanta · Sep 7, 2017 · 2da5eaf · 2da5eaf
1 parent 1b9cee6
commit 2da5eaf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -189,9 +189,7 @@ void Shutdown()
     StopRPC();
     StopHTTPServer();
 #ifdef ENABLE_WALLET
-    for (CWalletRef pwallet : vpwallets) {
-        pwallet->Flush(false);
-    }
+    FlushWallets(false);
 #endif
     MapPort(false);
     UnregisterValidationInterface(peerLogic.get());
@@ -246,9 +244,7 @@ void Shutdown()
         pblocktree = nullptr;
     }
 #ifdef ENABLE_WALLET
-    for (CWalletRef pwallet : vpwallets) {
-        pwallet->Flush(true);
-    }
+    FlushWallets(true);
 #endif
 
 #if ENABLE_ZMQ

diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp
@@ -245,3 +245,9 @@ bool OpenWallets()
 
     return true;
 }
+
+void FlushWallets(bool shutdown) {
+    for (CWalletRef pwallet : vpwallets) {
+        pwallet->Flush(shutdown);
+    }
+}
diff --git a/src/wallet/init.h b/src/wallet/init.h
@@ -22,4 +22,7 @@ bool VerifyWallets();
 //! Load wallet databases.
 bool OpenWallets();
 
+//! Flush all wallets in preparation for shutdown.
+//! Call with shutdown = true to actually shutdown the wallet.
+void FlushWallets(bool shutdown);
 #endif // BITCOIN_WALLET_INIT_H