Differential D3618

Rename wallet database classes
ClosedPublic
Actions

Authored by deadalnix on Jul 9 2019, 18:59.

Details

Reviewers

Fabien

Group Reviewers

Restricted Project

Commits

rSTAGING7efaaeb4c10c: Rename wallet database classes
rABC7efaaeb4c10c: Rename wallet database classes

Summary

This is a backport of Core PR11851:

scripted-diff: Rename wallet database classes

-BEGIN VERIFY SCRIPT-

sed -i 's/\<CWalletDBWrapper\>/BerkeleyDatabase/g' src/wallet/db.h src/wallet/db.cpp
sed -i '/statuses/i/** Backend-agnostic database type. */\nusing WalletDatabase = BerkeleyDatabase\;\n' src/wallet/walletdb.h
ren() { git grep -l "\<$1\>" 'src/*.cpp' 'src/*.h' ':(exclude)*dbwrapper*' test | xargs sed -i "s:\<$1\>:$2:g"; }
ren CDBEnv BerkeleyEnvironment
ren CDB BerkeleyBatch
ren CWalletDBWrapper WalletDatabase
ren CWalletDB WalletBatch
ren dbw database
ren m_dbw m_database
ren walletdb batch
ren pwalletdb batch
ren pwalletdbIn batch_in
ren wallet/batch.h wallet/walletdb.h
ren pwalletdbEncryption encrypted_batch

-END VERIFY SCRIPT-

Update walletdb comment after renaming.

Text from https://github.com/bitcoin/bitcoin/pull/11851#issuecomment-350320608
by John Newbery <john@johnnewbery.com>.

Add m_ prefix to WalletBatch::m_batch

Test Plan

make check
test/functional/test_runner.py --extended

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

deadalnix created this revision.Jul 9 2019, 18:59

Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 9 2019, 18:59

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

Harbormaster completed remote builds in B6771: Diff 10151.Jul 9 2019, 19:07

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Fabien requested changes to this revision.Jul 10 2019, 08:03

Fabien added a subscriber: Fabien.

Fabien added inline comments.

src/wallet/db.cpp
125 ↗	(On Diff #10151)	How can this build ?
src/wallet/test/walletdb_tests.cpp
16 ↗	(On Diff #10151)	Please split this refactor out from this diff, it is unrelated.
src/wallet/wallet.cpp
862 ↗	(On Diff #10151)	Revert.
1281 ↗	(On Diff #10151)	Revert.
3684 ↗	(On Diff #10151)	Dito
src/wallet/wallet.h
675 ↗	(On Diff #10151)	There is a missing dependency here. Edit: PR12785
1054 ↗	(On Diff #10151)	Unrelated, but OK (oversight from D2673)

This revision now requires changes to proceed.Jul 10 2019, 08:03

Fabien added a child revision: D3629: [wallet] Fix potential memory leak in CreateWalletFromFile.Jul 10 2019, 08:55

iRebase on top of D3618 and fix comments.

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

deadalnix added inline comments.Jul 10 2019, 14:41

src/wallet/db.cpp
125 ↗	(On Diff #10151)	Because it is a type from BDB.
src/wallet/test/walletdb_tests.cpp
16 ↗	(On Diff #10151)	I don't see any real benefit doing so considering this needs to be modified regardless.