From 9ae73247e23e272a866e681d4150df4d8d563201 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 29 Aug 2018 11:25:32 -0700 Subject: [PATCH] Refactor: rename UnlockAllNotes -> UnlockAllSproutNotes --- src/wallet/gtest/test_wallet.cpp | 2 +- src/wallet/wallet.cpp | 2 +- src/wallet/wallet.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wallet/gtest/test_wallet.cpp b/src/wallet/gtest/test_wallet.cpp index 86e3e2a2b..cfaab1f6d 100644 --- a/src/wallet/gtest/test_wallet.cpp +++ b/src/wallet/gtest/test_wallet.cpp @@ -1995,7 +1995,7 @@ TEST(WalletTests, SproutNoteLocking) { EXPECT_TRUE(wallet.IsLockedNote(jsoutpt2)); // Test unlock all - wallet.UnlockAllNotes(); + wallet.UnlockAllSproutNotes(); EXPECT_FALSE(wallet.IsLockedNote(jsoutpt)); EXPECT_FALSE(wallet.IsLockedNote(jsoutpt2)); } diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 608eb727d..9ee752937 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3838,7 +3838,7 @@ void CWallet::UnlockNote(const JSOutPoint& output) setLockedSproutNotes.erase(output); } -void CWallet::UnlockAllNotes() +void CWallet::UnlockAllSproutNotes() { AssertLockHeld(cs_wallet); // setLockedSproutNotes setLockedSproutNotes.clear(); diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 79e9c6fc7..1432af95d 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -967,7 +967,7 @@ public: bool IsLockedNote(const JSOutPoint& outpt) const; void LockNote(const JSOutPoint& output); void UnlockNote(const JSOutPoint& output); - void UnlockAllNotes(); + void UnlockAllSproutNotes(); std::vector ListLockedNotes();