diff options
| author | Ava Chow <github@achow101.com> | 2024-10-01 13:30:02 -0400 |
|---|---|---|
| committer | Ava Chow <github@achow101.com> | 2024-10-01 13:30:02 -0400 |
| commit | 110183746150428e6385880c79f8c5733b1361ba (patch) | |
| tree | 49ca493995cf8384ead6e92fb2747a72c1107130 /src | |
| parent | 1147e72953d1f262111a4b1d5a438a8394511bc7 (diff) | |
| parent | 5de225f5c145368f70cb5f870933bcf9df6b92c8 (diff) | |
Merge bitcoin/bitcoin#30959: [28.x] backports and finalizev28.0
5de225f5c145368f70cb5f870933bcf9df6b92c8 doc: 28.0 Release Notes (Ava Chow)
98745e03ffc9f69f901b827e19e4d8d645a27112 doc: generate manpages (Ava Chow)
5feef9ce7ebf608e45aa9682512599494c0d46d8 build: Bump to 28.0 (Ava Chow)
7fcd7b85c64ffbcd67d8ff1add46d258b26b2029 validation: Disable CheckForkWarningConditions for background chainstate (Martin Zumsande)
e24a25d882ba8c8dacc1eede6b9373fe7601f85b test: Use shell builtins in run_command test case (Ava Chow)
Pull request description:
* #30952
* #30962
* Finalize 28.0 (or rc3 if additional backports are needed)
ACKs for top commit:
sipa:
utACK 5de225f5c145368f70cb5f870933bcf9df6b92c8
Tree-SHA512: b42948a04d4250f2c9ef3331a39a4c3d7de9ceb9f4f294dd283599d08f3e2b7147297ef9ec1c4276e291a015fc2daa5a72c1f1c33fb517e8ea5c740c4459bf32
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/system_tests.cpp | 2 | ||||
| -rw-r--r-- | src/validation.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp index 07d15f5552..c9dd9c82cd 100644 --- a/src/test/system_tests.cpp +++ b/src/test/system_tests.cpp @@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE(run_command) } { // Return non-zero exit code, with error message for stderr - const std::string command{"python3 -c 'import sys; print(\"err\", file=sys.stderr); sys.exit(2)'"}; + const std::string command{"sh -c 'echo err 1>&2 && false'"}; const std::string expected{"err"}; BOOST_CHECK_EXCEPTION(RunCommandParseJSON(command), std::runtime_error, [&](const std::runtime_error& e) { const std::string what(e.what()); diff --git a/src/validation.cpp b/src/validation.cpp index a6b7f3d361..59beb5cbda 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2023,7 +2023,8 @@ void Chainstate::CheckForkWarningConditions() // Before we get past initial download, we cannot reliably alert about forks // (we assume we don't get stuck on a fork before finishing our initial sync) - if (m_chainman.IsInitialBlockDownload()) { + // Also not applicable to the background chainstate + if (m_chainman.IsInitialBlockDownload() || this->GetRole() == ChainstateRole::BACKGROUND) { return; } |