From 00f09c920c2e8906d2260251be6d1d2fa1bbb29d Mon Sep 17 00:00:00 2001 From: Patrick Strateman Date: Tue, 7 Jun 2016 21:25:31 -0700 Subject: Split CWallet::AddToWallet into AddToWallet and LoadToWallet. This removes the fFromLoadWallet flag in AddToWallet. These were already effectively two methods. --- src/wallet/rpcdump.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/wallet/rpcdump.cpp') diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 6647d3297..9d403a453 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -310,7 +310,7 @@ UniValue importprunedfunds(const UniValue& params, bool fHelp) if (pwalletMain->IsMine(tx)) { CWalletDB walletdb(pwalletMain->strWalletFile, "r+", false); - pwalletMain->AddToWallet(wtx, false, &walletdb); + pwalletMain->AddToWallet(wtx, &walletdb); return NullUniValue; } -- cgit v1.2.3 From 867f842f1e5a385aeb2093f802d6f37a84d0fe5d Mon Sep 17 00:00:00 2001 From: Patrick Strateman Date: Tue, 7 Jun 2016 21:41:03 -0700 Subject: Remove CWalletDB* parameter from CWallet::AddToWallet --- src/wallet/rpcdump.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/wallet/rpcdump.cpp') diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 9d403a453..fe8b53ceb 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -309,8 +309,7 @@ UniValue importprunedfunds(const UniValue& params, bool fHelp) LOCK2(cs_main, pwalletMain->cs_wallet); if (pwalletMain->IsMine(tx)) { - CWalletDB walletdb(pwalletMain->strWalletFile, "r+", false); - pwalletMain->AddToWallet(wtx, &walletdb); + pwalletMain->AddToWallet(wtx, false); return NullUniValue; } -- cgit v1.2.3