highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-05 10:42:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#31156: test: Don't enforce BIP94 on regtest unless specified by arg

Browse Source 
e60cecc811 doc: add release note for 31156 (Martin Zumsande)
fc7dfb3df5 test: Don't enforce BIP94 on regtest unless specified by arg (Martin Zumsande)

Pull request description:

  The added arg `-test=bip94` is only used in a functional test for BIP94. This is done because the default regtest consensus rules should follow mainnet, not testnet.

  Fixes #31137.

ACKs for top commit:
  achow101:
    ACK e60cecc811
  tdb3:
    cr and light test ACK e60cecc811
  rkrux:
    tACK e60cecc811
  BrandonOdiwuor:
    utACK e60cecc811
  laanwj:
    Code review ACK e60cecc811

Tree-SHA512: ca2f322f89d8808dfc3565fe020d2615cfcc110e188a02128ad7108fef51c735b33d55b5e6a70c505d78f7291f3c635dc7dfbcd78be1348d4d6e483883be4216
This commit is contained in:
Ava Chow
2024-10-30 17:00:14 -04:00
parent 02be3dced7 e60cecc811
commit 4a31f8ccc9
6 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/args.cpp
View File

@@ -709,6 +709,7 @@ std::string HelpMessageOpt(const std::string &option, const std::string &message
const std::vector<std::string> TEST_OPTIONS_DOC{
"addrman (use deterministic addrman)",
"bip94 (enforce BIP94 consensus rules)",
};
bool HasTestOption(const ArgsManager& args, const std::string& test_option)