CWallet::Create move chain init message up into calling code

S3RK · S3RK · commit d73ae939649f · 2021-05-19T08:50:20.000+02:00
diff --git a/src/wallet/load.cpp b/src/wallet/load.cpp
@@ -105,6 +105,7 @@ bool LoadWallets(interfaces::Chain& chain)
             if (!database && status == DatabaseStatus::FAILED_NOT_FOUND) {
                 continue;
             }
+            chain.initMessage(_("Loading wallet...").translated);
             std::shared_ptr<CWallet> pwallet = database ? CWallet::Create(chain, name, std::move(database), options.create_flags, error, warnings) : nullptr;
             if (!warnings.empty()) chain.initWarning(Join(warnings, Untranslated("\n")));
             if (!pwallet) {
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -213,6 +213,7 @@ std::shared_ptr<CWallet> LoadWalletInternal(interfaces::Chain& chain, const std:
             return nullptr;
         }
 
+        chain.initMessage(_("Loading wallet...").translated);
         std::shared_ptr<CWallet> wallet = CWallet::Create(chain, name, std::move(database), options.create_flags, error, warnings);
         if (!wallet) {
             error = Untranslated("Wallet loading failed.") + Untranslated(" ") + error;
@@ -292,6 +293,7 @@ std::shared_ptr<CWallet> CreateWallet(interfaces::Chain& chain, const std::strin
     }
 
     // Make the wallet
+    chain.initMessage(_("Loading wallet...").translated);
     std::shared_ptr<CWallet> wallet = CWallet::Create(chain, name, std::move(database), wallet_creation_flags, error, warnings);
     if (!wallet) {
         error = Untranslated("Wallet creation failed.") + Untranslated(" ") + error;
@@ -3887,8 +3889,6 @@ std::shared_ptr<CWallet> CWallet::Create(interfaces::Chain& chain, const std::st
 {
     const std::string& walletFile = database->Filename();
 
-    chain.initMessage(_("Loading wallet…").translated);
-
     int64_t nStart = GetTimeMillis();
     // TODO: Can't use std::make_shared because we need a custom deleter but
     // should be possible to use std::allocate_shared.

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ bool LoadWallets(interfaces::Chain& chain)`
`105`	`105`	`if (!database && status == DatabaseStatus::FAILED_NOT_FOUND) {`
`106`	`106`	`continue;`
`107`	`107`	`}`
	`108`	`+ chain.initMessage(_("Loading wallet...").translated);`
`108`	`109`	`std::shared_ptr<CWallet> pwallet = database ? CWallet::Create(chain, name, std::move(database), options.create_flags, error, warnings) : nullptr;`
`109`	`110`	`if (!warnings.empty()) chain.initWarning(Join(warnings, Untranslated("\n")));`
`110`	`111`	`if (!pwallet) {`