Details

Reviewers

jasonbcox
Fabien
deadalnix

Group Reviewers

Restricted Project

Commits

rSTAGING9044d3d396df: Merge #14409: utils and libraries: Make 'blocksdir' always net specific
rABC9044d3d396df: Merge #14409: utils and libraries: Make 'blocksdir' always net specific

Summary

PR14409 backport https://github.com/bitcoin/bitcoin/pull/14409/files
e4a0c3547ed886871f8b3d51c6b4ffdb181a8b9c Improve blocksdir functional test. (Hennadii Stepanov)
c3f1821ac788e522e7558e3575150433450dcb8c Make blockdir always net specific (Hennadii Stepanov)

Pull request description:

The blocks directory is net specific by definition.

Also this prevents the side effect of calling `GetBlocksDir(false)` in the non-mainnet environment.
Currently a new node creates an unused `blocks\` directory in the root of the data directory when `-testnet` or `-regtest` is specified.

Depends on D3312

Test Plan

make check
test_runner.py

Diff Detail

Repository

rABC Bitcoin ABC

Branch

PR14409

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 6302
Build 10651: Bitcoin ABC Buildbot (legacy)
Build 10650: arc lint + arc unit

Event Timeline

markblundeberg created this revision.May 20 2019, 18:20

Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 20 2019, 18:20

Herald added a reviewer: deadalnix. · View Herald Transcript

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

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

Harbormaster failed remote builds in B5906: Diff 8748!May 20 2019, 18:31

markblundeberg planned changes to this revision.May 20 2019, 18:35

Very confusing build failure ... will return at a later date.

markblundeberg mentioned this in D3082: qa: Cache only chain and wallet for regtest datadir.May 21 2019, 14:27

rebased onto D3082

This appears to be getting further along now, but still errors out on my machine.

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

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

Harbormaster failed remote builds in B5926: Diff 8780!May 21 2019, 16:05

still awful

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

markblundeberg planned changes to this revision.Jun 11 2019, 00:25

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

Harbormaster failed remote builds in B6262: Diff 9309!Jun 11 2019, 00:33

finally found the bug that was making tests fail! (D3312)

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

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

Harbormaster completed remote builds in B6302: Diff 9376.Jun 13 2019, 05:55

Fabien requested changes to this revision.Jun 13 2019, 07:57

Fabien added inline comments.

src/init.cpp
1440	This one is a missing dependency: https://github.com/bitcoin/bitcoin/pull/13775/files.

This revision now requires changes to proceed.Jun 13 2019, 07:57

take out accidental backported line

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

markblundeberg added inline comments.Jun 13 2019, 14:06

src/init.cpp
1440	Yep, looks like that depends on #12560 though, so I'll just work around that for now. No worries about regression if backporting 13775 accidentally restores GetBlocksDir(false), since it will make obvious compiler error.