wallet: BerkeleyDatabase make BerkeleyDatabase::Create, CreateMock, and CreateDummy non-static functions#19310
Merged
maflcko merged 3 commits intobitcoin:masterfrom Jun 18, 2020
Merged
Conversation
These functions doing the same things as WalletDatabase::Create, CreateMock, and CreateDummy
8 tasks
-BEGIN VERIFY SCRIPT-
sed -i -e 's/WalletDatabase::Create(/CreateWalletDatabase(/g' `git grep -l "WalletDatabase::Create("`
sed -i -e 's/WalletDatabase::CreateDummy(/CreateDummyWalletDatabase(/g' `git grep -l "WalletDatabase::CreateDummy("`
sed -i -e 's/WalletDatabase::CreateMock(/CreateMockWalletDatabase(/g' `git grep -l "WalletDatabase::CreateMock("`
-END VERIFY SCRIPT-
These are superseded by CreateWalletDatabase, CreateMockWalletDatabase, and CreateDummyWalletDatabase
55869ce to
da7a83c
Compare
Member
|
ACK da7a83c 🎂 Show signature and timestampSignature: Timestamp of file with hash |
Contributor
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
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. |
This was referenced Jun 18, 2020
Merged
Fabcien
pushed a commit
to Bitcoin-ABC/bitcoin-abc
that referenced
this pull request
Jun 2, 2021
Summary: These functions doing the same things as WalletDatabase::Create, CreateMock, and CreateDummy This is a backport of [[bitcoin/bitcoin#19310 | core#19310]] [1/3] bitcoin/bitcoin@45c08f8 Test Plan: `ninja` Reviewers: #bitcoin_abc, deadalnix Reviewed By: #bitcoin_abc, deadalnix Differential Revision: https://reviews.bitcoinabc.org/D9619
Fabcien
pushed a commit
to Bitcoin-ABC/bitcoin-abc
that referenced
this pull request
Jun 2, 2021
Summary:
```
-BEGIN VERIFY SCRIPT-
sed -i -e 's/WalletDatabase::Create(/CreateWalletDatabase(/g' `git grep -l "WalletDatabase::Create("`
sed -i -e 's/WalletDatabase::CreateDummy(/CreateDummyWalletDatabase(/g' `git grep -l "WalletDatabase::CreateDummy("`
sed -i -e 's/WalletDatabase::CreateMock(/CreateMockWalletDatabase(/g' `git grep -l "WalletDatabase::CreateMock("`
arc lint
-END VERIFY SCRIPT-
```
This is a partial backport of [[bitcoin/bitcoin#19310 | core#19310]] [2/3]
Can be compared with bitcoin/bitcoin@d6045d0
Backport note: I ran the script rather than cherry-picking the commit.
Depends on D9619
Test Plan: `ninja all check-all`
Reviewers: #bitcoin_abc, deadalnix
Reviewed By: #bitcoin_abc, deadalnix
Differential Revision: https://reviews.bitcoinabc.org/D9620
Fabcien
pushed a commit
to Bitcoin-ABC/bitcoin-abc
that referenced
this pull request
Jun 2, 2021
Summary: These are superseded by CreateWalletDatabase, CreateMockWalletDatabase, and CreateDummyWalletDatabase This concludes backport of [[bitcoin/bitcoin#19310 | core#19310]] [3/3] bitcoin/bitcoin@da7a83c Test Plan: `ninja all check-all` Reviewers: #bitcoin_abc, deadalnix Reviewed By: #bitcoin_abc, deadalnix Differential Revision: https://reviews.bitcoinabc.org/D9621
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Instead of having
Create,CreateMock, andCreateDummybeing static functions inBerkeleyDatabase, move these to standalone functions inwalletdb.cpp. This prepares us for having differentWalletDatabaseclasses.Part of #18971. This was originally one commit but has been split into 3 to make it (hopefully) easier to review.