Allow wallet files in multiple directories
ClosedPublic
Actions

Authored by Fabien on May 24 2019, 14:06.

Details

Reviewers

deadalnix

Group Reviewers

Restricted Project

Commits

rSTAGINGf00d8bc7e0e5: Allow wallet files in multiple directories
rABCf00d8bc7e0e5: Allow wallet files in multiple directories

Summary

Remove requirement that two wallet files can only be opened at the same
time if
they are contained in the same directory.

This change mostly consists of updates to function signatures (updating
functions to take fs::path arguments, instead of combinations of
strings,
fs::path, and CDBEnv / CWalletDBWrapper arguments).

Partial backport of core PR11687 (commit d8a99f6)
https://github.com/bitcoin/bitcoin/pull/11687/commits/d8a99f65e53019becdd8d2631396012bafb29741#diff-5ddca6879fe54b576a2fc4598d9f29ce

Depends on D3102
Progress towards T651

Test Plan

make check
./test/functional/test_runner.py wallet_*

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

Fabien created this revision.May 24 2019, 14:06

Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 24 2019, 14:06

Herald added a reviewer: deadalnix. · View Herald Transcript

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

Fabien added a child revision: D3104: Allow wallet files not in -walletdir directory.May 24 2019, 14:09

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

Harbormaster completed remote builds in B5967: Diff 8847.May 24 2019, 14:21

Rebase

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

Harbormaster completed remote builds in B6014: Diff 8927.May 27 2019, 16:14

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

deadalnix requested changes to this revision.May 27 2019, 16:38

deadalnix added inline comments.

src/wallet/test/wallet_tests.cpp
45 ↗	(On Diff #8927)	There is something missing here, meaning you have missing dependency, and you must know it because you also must have got a merge conflict.

This revision now requires changes to proceed.May 27 2019, 16:38

Fabien requested review of this revision.May 27 2019, 18:24

Fabien added inline comments.

src/wallet/test/wallet_tests.cpp
45 ↗	(On Diff #8927)	If you're talking about `static const CWallet testWallet("dummy", CWalletDBWrapper::CreateDummy());`, the static test wallet has been removed in https://reviews.bitcoinabc.org/D1079, thus not reintroduced here. If you prefer to abandon ownership of this code this can be rolled back, but is out of scope for this PR.