From 598cc8bbddaf2532490d8610cdc4aba130e926e3 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Thu, 12 Nov 2020 09:32:53 +0100 Subject: [PATCH] Merge #20285: Remove references to CreateWalletFromFile c82336c493b112160d781974d4066fcb956b85f6 Remove references to CreateWalletFromFile (fanquake) Pull request description: `CWallet::CreateWalletFromFile()` was removed in 8b5e7297c02f3100a9cb27bfe206e3fc617ec173 but these references remain. ACKs for top commit: hebasto: ACK c82336c493b112160d781974d4066fcb956b85f6 Tree-SHA512: 3dd50fe0cd5a60bbc96d265107d4739f3e08f943435f3772038963ac4be9e4a87a863412ac0d571226ea66d71550b17b52f01b9d46a6282d49feae1508fd682e --- src/wallet/test/wallet_tests.cpp | 4 ++-- test/sanitizer_suppressions/tsan | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp index 045836f32821d9..e8a8b356eb5cb0 100644 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -1198,7 +1198,7 @@ BOOST_FIXTURE_TEST_CASE(wallet_disableprivkeys, TestChain100Setup) BOOST_CHECK(!wallet->GetNewDestination("", dest, error)); } -//! Test CreateWalletFromFile function and its behavior handling potential race +//! Test CWallet::Create() and its behavior handling potential race //! conditions if it's called the same time an incoming transaction shows up in //! the mempool or a new block. //! @@ -1216,7 +1216,7 @@ BOOST_FIXTURE_TEST_CASE(wallet_disableprivkeys, TestChain100Setup) //! wallet rescan and notifications are immediately synced, to verify the wallet //! must already have a handler in place for them, and there's no gap after //! rescanning where new transactions in new blocks could be lost. -BOOST_FIXTURE_TEST_CASE(CreateWalletFromFile, TestChain100Setup) +BOOST_FIXTURE_TEST_CASE(CreateWallet, TestChain100Setup) { gArgs.ForceSetArg("-unsafesqlitesync", "1"); // Create new wallet with known key and unload it. diff --git a/test/sanitizer_suppressions/tsan b/test/sanitizer_suppressions/tsan index c2a6ef88352564..4f0d8bdcd74ba3 100644 --- a/test/sanitizer_suppressions/tsan +++ b/test/sanitizer_suppressions/tsan @@ -37,7 +37,7 @@ deadlock:CConnman::ForNode deadlock:CConnman::GetNodeStats deadlock:CChainState::ConnectTip deadlock:UpdateTip -deadlock:wallet_tests::CreateWalletFromFile +deadlock:wallet_tests::CreateWallet # WalletBatch (unidentified deadlock) deadlock:WalletBatch