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 /src/util/system.h | |
| 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 'src/util/system.h')
| -rw-r--r-- | src/util/system.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/util/system.h b/src/util/system.h index dca32cc6fc..5932e55793 100644 --- a/src/util/system.h +++ b/src/util/system.h @@ -79,7 +79,8 @@ void ReleaseDirectoryLocks(); bool TryCreateDirectories(const fs::path& p); fs::path GetDefaultDataDir(); -const fs::path &GetBlocksDir(bool fNetSpecific = true); +// The blocks directory is always net specific. +const fs::path &GetBlocksDir(); const fs::path &GetDataDir(bool fNetSpecific = true); void ClearDatadirCache(); fs::path GetConfigFile(const std::string& confPath); |