diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-01-16 13:28:54 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-01-16 13:40:27 +0100 |
| commit | 64ee94356fb4b3ceda57c68d40ce192fc62c209e (patch) | |
| tree | 2072f96277c29eea16936b3d4e83cc64f21f0b02 /test | |
| parent | 3ae3748ce1bd6f681896b4dbe40964310cf857fe (diff) | |
| parent | e4a0c3547ed886871f8b3d51c6b4ffdb181a8b9c (diff) | |
| download | bitcoin-64ee94356fb4b3ceda57c68d40ce192fc62c209e.tar.xz | |
Merge #14409: utils and libraries: Make 'blocksdir' always net specific
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.
Refs:
- #12653
- https://github.com/bitcoin/bitcoin/pull/12653#discussion_r174784834 by @laanwj
- https://github.com/bitcoin/bitcoin/issues/14595#issuecomment-436011186
Tree-SHA512: c9957a68a4a200ebd2010823a56db7e61563afedcb7c9828e86b13f3af2990e07854b622c1f3374756f94574acb3ea32de7d2a399eef6c0623f0e11265155627
Diffstat (limited to 'test')
| -rwxr-xr-x | test/functional/feature_blocksdir.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/functional/feature_blocksdir.py b/test/functional/feature_blocksdir.py index c170f510c8..3a4889bbe9 100755 --- a/test/functional/feature_blocksdir.py +++ b/test/functional/feature_blocksdir.py @@ -18,6 +18,8 @@ class BlocksdirTest(BitcoinTestFramework): def run_test(self): self.stop_node(0) + assert os.path.isdir(os.path.join(self.nodes[0].datadir, "regtest", "blocks")) + assert not os.path.isdir(os.path.join(self.nodes[0].datadir, "blocks")) shutil.rmtree(self.nodes[0].datadir) initialize_datadir(self.options.tmpdir, 0) self.log.info("Starting with nonexistent blocksdir ...") |