Skip to content

Commit 3e5ac27

Browse files
committed
qml: pass load flag when restoring wallets
1 parent bf78a85 commit 3e5ac27

4 files changed

Lines changed: 6 additions & 4 deletions

File tree

qml/walletqmlcontroller.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,8 @@ void WalletQmlController::startWalletImport(const QString& path)
10351035
auto wallet = m_node.walletLoader().restoreWallet(
10361036
fs::PathFromString(normalized_path.toStdString()),
10371037
restore_wallet_name.toStdString(),
1038-
warning_messages);
1038+
warning_messages,
1039+
/*load_after_restore=*/true);
10391040
const QString warnings = JoinWarnings(warning_messages);
10401041

10411042
if (!wallet) {

test/test_rpcconsolemodel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class MockWalletLoader : public interfaces::WalletLoader
6161
std::string getWalletDir() override { return {}; }
6262

6363
util::Result<std::unique_ptr<interfaces::Wallet>> restoreWallet(
64-
const fs::path&, const std::string&, std::vector<bilingual_str>&) override
64+
const fs::path&, const std::string&, std::vector<bilingual_str>&, bool) override
6565
{ return util::Error{}; }
6666

6767
util::Result<interfaces::WalletMigrationResult> migrateWallet(

test/test_walletlistmodel.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <scheduler.h>
1111
#include <test/mocks/mocknode.h>
1212
#include <util/translation.h>
13+
#include <wallet/types.h>
1314

1415
#include <gmock/gmock.h>
1516

@@ -37,7 +38,7 @@ class FakeWalletLoader : public interfaces::WalletLoader
3738
return util::Error{Untranslated("Unexpected loadWallet call")};
3839
}
3940
std::string getWalletDir() override { return {}; }
40-
util::Result<std::unique_ptr<interfaces::Wallet>> restoreWallet(const fs::path&, const std::string&, std::vector<bilingual_str>&) override
41+
util::Result<std::unique_ptr<interfaces::Wallet>> restoreWallet(const fs::path&, const std::string&, std::vector<bilingual_str>&, bool) override
4142
{
4243
return util::Error{Untranslated("Unexpected restoreWallet call")};
4344
}

test/test_walletqmlcontroller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class FakeWalletLoader : public interfaces::WalletLoader
110110
return load_wallet_fn(name, warnings);
111111
}
112112
std::string getWalletDir() override { return wallet_dir; }
113-
util::Result<std::unique_ptr<interfaces::Wallet>> restoreWallet(const fs::path&, const std::string&, std::vector<bilingual_str>&) override
113+
util::Result<std::unique_ptr<interfaces::Wallet>> restoreWallet(const fs::path&, const std::string&, std::vector<bilingual_str>&, bool) override
114114
{
115115
return util::Error{Untranslated("Unexpected restoreWallet call")};
116116
}

0 commit comments

Comments
 (0)