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

jnewbery · jnewbery · commit 062d63102eb1 · 2017-09-07T16:21:26.000-07:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -265,10 +265,7 @@ void Shutdown()
     UnregisterAllValidationInterfaces();
     GetMainSignals().UnregisterBackgroundSignalScheduler();
 #ifdef ENABLE_WALLET
-    for (CWalletRef pwallet : vpwallets) {
-        delete pwallet;
-    }
-    vpwallets.clear();
+    CloseWallets();
 #endif
     globalVerifyHandle.reset();
     ECC_Stop();
diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp
@@ -257,3 +257,10 @@ void StopWallets() {
         pwallet->Flush(true);
     }
 }
+
+void CloseWallets() {
+    for (CWalletRef pwallet : vpwallets) {
+        delete pwallet;
+    }
+    vpwallets.clear();
+}
diff --git a/src/wallet/init.h b/src/wallet/init.h
@@ -27,4 +27,8 @@ void FlushWallets();
 
 //! Stop all wallets. Wallets will be flushed first.
 void StopWallets();
+
+//! Close all wallets.
+void CloseWallets();
+
 #endif // BITCOIN_WALLET_INIT_H

Original file line number	Diff line number	Diff line change
`@@ -257,3 +257,10 @@ void StopWallets() {`
`257`	`257`	`pwallet->Flush(true);`
`258`	`258`	`}`
`259`	`259`	`}`
	`260`	`+`
	`261`	`+void CloseWallets() {`
	`262`	`+ for (CWalletRef pwallet : vpwallets) {`
	`263`	`+ delete pwallet;`
	`264`	`+ }`
	`265`	`+ vpwallets.clear();`
	`266`	`+}`