phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-26 11:13:23 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove references to CreateWalletFromFile

Browse source 
CWallet::CreateWalletFromFile() was removed in
8b5e7297c0 but these references remain.
This commit is contained in:
fanquake 2020-11-02 20:42:21 +08:00
parent c2d8ba6265
commit c82336c493
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/init.cpp
View file

@ -1145,7 +1145,7 @@ bool AppInitParameterInteraction(const ArgsManager& args)
if (!ParseMoney(args.GetArg("-minrelaytxfee", ""), n)) { if (!ParseMoney(args.GetArg("-minrelaytxfee", ""), n)) {
return InitError(AmountErrMsg("minrelaytxfee", args.GetArg("-minrelaytxfee", ""))); return InitError(AmountErrMsg("minrelaytxfee", args.GetArg("-minrelaytxfee", "")));
} }
// High fee check is done afterward in CWallet::CreateWalletFromFile() // High fee check is done afterward in CWallet::Create()
::minRelayTxFee = CFeeRate(n); ::minRelayTxFee = CFeeRate(n);
} else if (incrementalRelayFee > ::minRelayTxFee) { } else if (incrementalRelayFee > ::minRelayTxFee) {
// Allow only setting incrementalRelayFee to control both // Allow only setting incrementalRelayFee to control both

4
src/wallet/test/wallet_tests.cpp
View file

@ -688,7 +688,7 @@ BOOST_FIXTURE_TEST_CASE(wallet_descriptor_test, BasicTestingSetup)
BOOST_CHECK_EXCEPTION(vr >> w_desc, std::ios_base::failure, malformed_descriptor); BOOST_CHECK_EXCEPTION(vr >> w_desc, std::ios_base::failure, malformed_descriptor);
} }
//! 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 //! conditions if it's called the same time an incoming transaction shows up in
//! the mempool or a new block. //! the mempool or a new block.
//! //!
@ -706,7 +706,7 @@ BOOST_FIXTURE_TEST_CASE(wallet_descriptor_test, BasicTestingSetup)
//! wallet rescan and notifications are immediately synced, to verify the wallet //! 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 //! 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. //! rescanning where new transactions in new blocks could be lost.
BOOST_FIXTURE_TEST_CASE(CreateWalletFromFile, TestChain100Setup) BOOST_FIXTURE_TEST_CASE(CreateWallet, TestChain100Setup)
{ {
// Create new wallet with known key and unload it. // Create new wallet with known key and unload it.
auto chain = interfaces::MakeChain(m_node); auto chain = interfaces::MakeChain(m_node);

2
test/sanitizer_suppressions/tsan
View file

@ -32,7 +32,7 @@ deadlock:CConnman::ForNode
deadlock:CConnman::GetNodeStats deadlock:CConnman::GetNodeStats
deadlock:CChainState::ConnectTip deadlock:CChainState::ConnectTip
deadlock:UpdateTip deadlock:UpdateTip
deadlock:wallet_tests::CreateWalletFromFile deadlock:wallet_tests::CreateWallet
# WalletBatch (unidentified deadlock) # WalletBatch (unidentified deadlock)
deadlock:WalletBatch deadlock:WalletBatch