Remove references to CreateWalletFromFile #20285

pull fanquake wants to merge 1 commits into bitcoin:master from fanquake:createwalletfromfilenomore changing 3 files +4 −4

fanquake commented at 12:45 PM on November 2, 2020: member

CWallet::CreateWalletFromFile() was removed in 8b5e7297c02f3100a9cb27bfe206e3fc617ec173 but these references remain.
hebasto approved
hebasto commented at 12:49 PM on November 2, 2020: member

Approach ACK 54ac7c87c38d6780389bf1edf38bb6327b099b83

https://github.com/bitcoin/bitcoin/blob/c5ec0367d718544caa3a1578d6c730fc92ee4e94/test/sanitizer_suppressions/tsan#L35 ?
practicalswift commented at 1:48 PM on November 2, 2020: contributor

Concept ACK: thanks for removing old cruft, but please remove the entry from test/sanitizer_suppressions/tsan too :)
DrahtBot added the label Wallet on Nov 2, 2020
DrahtBot commented at 2:57 PM on November 2, 2020: member


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #19983 (Drop some TSan suppressions by hebasto)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
fanquake force-pushed on Nov 3, 2020
fanquake commented at 12:21 PM on November 3, 2020: member

? but please remove the entry from test/sanitizer_suppressions/tsan too :)

Done.
dergoegge approved

dergoegge commented at 3:22 PM on November 7, 2020: member

ACK https://github.com/bitcoin/bitcoin/commit/64ffbba0843c123ae1de75847d4b303460d20e2f - All the references to CreateWalletFromFile were removed, except the ones in the release notes.

Before:

[niklas:~/workspace/bitcoin] c5ec0367d* ± ag "CreateWalletFromFile" .
test/sanitizer_suppressions/tsan
35:deadlock:wallet_tests::CreateWalletFromFile

doc/release-notes/release-notes-0.19.0.1.md
491:- [#16745](/bitcoin-bitcoin/16745/) Translate all initErrors in CreateWalletFromFile (MarcoFalke)
495:- [#16796](/bitcoin-bitcoin/16796/) Fix segfault in CreateWalletFromFile (MarcoFalke)

src/wallet/test/wallet_tests.cpp
691://! Test CreateWalletFromFile function and its behavior handling potential race
709:BOOST_FIXTURE_TEST_CASE(CreateWalletFromFile, TestChain100Setup)

src/init.cpp
1148:        // High fee check is done afterward in CWallet::CreateWalletFromFile()

After:

[niklas:~/workspace/bitcoin] createwalletfromfilenomore* ± ag "CreateWalletFromFile" .
doc/release-notes/release-notes-0.19.0.1.md
491:- [#16745](/bitcoin-bitcoin/16745/) Translate all initErrors in CreateWalletFromFile (MarcoFalke)
495:- [#16796](/bitcoin-bitcoin/16796/) Fix segfault in CreateWalletFromFile (MarcoFalke)

Remove references to CreateWalletFromFile

CWallet::CreateWalletFromFile() was removed in
8b5e7297c02f3100a9cb27bfe206e3fc617ec173 but these references remain.

c82336c493

in test/sanitizer_suppressions/tsan:35 in 64ffbba084 outdated
```
  31 | @@ -32,7 +32,6 @@ deadlock:CConnman::ForNode
  32 |  deadlock:CConnman::GetNodeStats
  33 |  deadlock:CChainState::ConnectTip
  34 |  deadlock:UpdateTip
  35 | -deadlock:wallet_tests::CreateWalletFromFile
```
hebasto commented at 7:37 PM on November 7, 2020:

This could be removed after #19982 fix. But now I'd suggest s/CreateWalletFromFile/CreateWallet/.

fanquake commented at 5:13 AM on November 12, 2020:

Ok. I've done that.
fanquake force-pushed on Nov 12, 2020
fanquake force-pushed on Nov 12, 2020
hebasto approved
hebasto commented at 8:17 AM on November 12, 2020: member

ACK c82336c493b112160d781974d4066fcb956b85f6
MarcoFalke added the label Refactoring on Nov 12, 2020
MarcoFalke merged this on Nov 12, 2020
MarcoFalke closed this on Nov 12, 2020
sidhujag referenced this in commit 62dcd66dc7 on Nov 12, 2020
Fabcien referenced this in commit fb6c0e694a on Dec 23, 2021
DrahtBot locked this on Feb 15, 2022
fanquake deleted the branch on Nov 9, 2022

Contributors

Labels

Remove references to CreateWalletFromFile #20285

Conflicts