Skip to content

Commit bcd142e

Browse files
author
MarcoFalke
committed
Merge bitcoin#20285: Remove references to CreateWalletFromFile
c82336c Remove references to CreateWalletFromFile (fanquake) Pull request description: `CWallet::CreateWalletFromFile()` was removed in 8b5e729 but these references remain. ACKs for top commit: hebasto: ACK c82336c Tree-SHA512: 3dd50fe0cd5a60bbc96d265107d4739f3e08f943435f3772038963ac4be9e4a87a863412ac0d571226ea66d71550b17b52f01b9d46a6282d49feae1508fd682e
2 parents c2d8ba6 + c82336c commit bcd142e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1145,7 +1145,7 @@ bool AppInitParameterInteraction(const ArgsManager& args)
11451145
if (!ParseMoney(args.GetArg("-minrelaytxfee", ""), n)) {
11461146
return InitError(AmountErrMsg("minrelaytxfee", args.GetArg("-minrelaytxfee", "")));
11471147
}
1148-
// High fee check is done afterward in CWallet::CreateWalletFromFile()
1148+
// High fee check is done afterward in CWallet::Create()
11491149
::minRelayTxFee = CFeeRate(n);
11501150
} else if (incrementalRelayFee > ::minRelayTxFee) {
11511151
// Allow only setting incrementalRelayFee to control both

src/wallet/test/wallet_tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ BOOST_FIXTURE_TEST_CASE(wallet_descriptor_test, BasicTestingSetup)
688688
BOOST_CHECK_EXCEPTION(vr >> w_desc, std::ios_base::failure, malformed_descriptor);
689689
}
690690

691-
//! Test CreateWalletFromFile function and its behavior handling potential race
691+
//! Test CWallet::Create() and its behavior handling potential race
692692
//! conditions if it's called the same time an incoming transaction shows up in
693693
//! the mempool or a new block.
694694
//!
@@ -706,7 +706,7 @@ BOOST_FIXTURE_TEST_CASE(wallet_descriptor_test, BasicTestingSetup)
706706
//! wallet rescan and notifications are immediately synced, to verify the wallet
707707
//! must already have a handler in place for them, and there's no gap after
708708
//! rescanning where new transactions in new blocks could be lost.
709-
BOOST_FIXTURE_TEST_CASE(CreateWalletFromFile, TestChain100Setup)
709+
BOOST_FIXTURE_TEST_CASE(CreateWallet, TestChain100Setup)
710710
{
711711
// Create new wallet with known key and unload it.
712712
auto chain = interfaces::MakeChain(m_node);

test/sanitizer_suppressions/tsan

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ deadlock:CConnman::ForNode
3232
deadlock:CConnman::GetNodeStats
3333
deadlock:CChainState::ConnectTip
3434
deadlock:UpdateTip
35-
deadlock:wallet_tests::CreateWalletFromFile
35+
deadlock:wallet_tests::CreateWallet
3636

3737
# WalletBatch (unidentified deadlock)
3838
deadlock:WalletBatch

0 commit comments

Comments
 (0)