From 021feb3187b207d511561c1f0ffd7f9e5e0c9c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Barbosa?= Date: Thu, 17 Sep 2020 22:23:45 +0100 Subject: [PATCH] refactor: Drop redudant CWallet::GetDBHandle --- src/wallet/wallet.h | 7 ------- src/wallet/walletdb.cpp | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 74de55dcb5..6ad75d3d69 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -732,13 +732,6 @@ public: */ mutable RecursiveMutex cs_wallet; - /** Get database handle used by this wallet. Ideally this function would - * not be necessary. - */ - WalletDatabase& GetDBHandle() - { - return *database; - } WalletDatabase& GetDatabase() const override { return *database; } /** diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index aa3b3c10b0..9ed9818479 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -943,7 +943,7 @@ void MaybeCompactWalletDB() } for (const std::shared_ptr& pwallet : GetWallets()) { - WalletDatabase& dbh = pwallet->GetDBHandle(); + WalletDatabase& dbh = pwallet->GetDatabase(); unsigned int nUpdateCounter = dbh.nUpdateCounter;