Skip to content

Conversation

@ajtowns
Copy link
Contributor

@ajtowns ajtowns commented Mar 21, 2021

Backport of unit test (#21334) and fuzz test (#21380) changes for versionbits.

@ajtowns
Copy link
Contributor Author

ajtowns commented Mar 21, 2021

Separate PR because the commits for #21334 can be merged to 0.20 without modification this way. The fuzz test commit has to be cherry-picked and edited due to lack of #20560 in 0.21.

Including these commits should make it easier to backport either of the speedy trial PRs.

@ajtowns ajtowns added the Tests label Mar 21, 2021
@ajtowns ajtowns added this to the 0.21.1 milestone Mar 21, 2021
@ajtowns ajtowns force-pushed the 202103-versionbits-tests-021 branch from d494650 to e775b0a Compare March 21, 2021 04:43
@maflcko
Copy link
Member

maflcko commented Mar 21, 2021

ACK

@maflcko maflcko merged commit 1bad33f into bitcoin:0.21 Mar 21, 2021
@maflcko maflcko removed the Tests label Mar 21, 2021
@maflcko
Copy link
Member

maflcko commented Mar 21, 2021

If anyone is running into compile failures in FuzzedDataProvider, a fix is being backported in #20901

fanquake added a commit that referenced this pull request Mar 24, 2021
5a2d98c doc: Remove outdated comment (Hennadii Stepanov)
8426e3a fuzz: Bump FuzzedDataProvider.h (MarcoFalke)
14e3f2a fuzz: Bump FuzzedDataProvider.h (MarcoFalke)
a48c9d3 fuzz: Update FuzzedDataProvider.h from upstream (LLVM) (practicalswift)
6746cd0 doc: add signet to doc/bitcoin-conf.md (Jon Atack)
58975d5 doc: add signet to share/examples/bitcoin.conf (Jon Atack)
b35711e Update vcpkg checkout commit. (Aaron Clauson)
3a12672 GUI: Write PSBTs to file with binary mode (Andrew Chow)
36ecf5e tests: Test that a fully signed tx given to signrawtx is unchanged (Andrew Chow)
4ef1e4b test: disallow sendtoaddress/sendmany when private keys disabled (Jon Atack)
d6b5eb5 Disallow sendtoaddress and sendmany when private keys disabled (Andrew Chow)
08dada8 util: Disallow negative mocktime (MarcoFalke)
95218ee net: Avoid UBSan warning in ProcessMessage(...) (practicalswift)
4607019 fix the unreachable code at feature_taproot (Bruno Garcia)
6dc58e9 qt: Use "fusion" style on macOS Big Sur with old Qt (Hennadii Stepanov)
e2ebc85 raise helpMessageDialog (randymcmillan)
a98f211 Fix MSVC build after gui#176 (Hennadii Stepanov)
bdc64c9 qt: Stop the effect of hidden widgets on the size of QStackedWidget (Hennadii Stepanov)
7bc4498 qt: Fix TxViewDelegate layout (Hennadii Stepanov)
b7086e6 qt: Add TransactionOverviewWidget class (Hennadii Stepanov)
0dba346 qt: Use layout manager for Create Wallet dialog (Hennadii Stepanov)
7bf3ed4 Bugfix: GUI: Restore SendConfirmationDialog button default to "Yes" (Luke Dashjr)
bdce029 test: add test for banning of non-IP addresses (Vasil Dimov)
c33fbab net: allow CSubNet of non-IP networks (Vasil Dimov)

Pull request description:

  Current backports for *0.21.1*.

  One conflict was in the test case.

ACKs for top commit:
  ajtowns:
    ACK 5a2d98c -- checked 'rebased-from' patches are in master, and rebased patches are clean rebases (except for the first one which changes `""s` to `std::string("")` to avoid c++17 dependency). commits seem fine, but haven't reviewed in detail.
  fanquake:
    ACK 5a2d98c - branched off `0.21` and redid the backports. Minor conflict in c33fbab. The diff between my branch and #20901 was just in release notes, `_CLIENT_VERSION_RC` (#20901 branched before 95ea54b) and #21490 which has already been merged into `0.21`.

Tree-SHA512: 75d16d3cf9066a45759758b8185dc3b9dad6a6102c2ac9921f758a310e48d5d3122f0dafa515df42475235fc66a42cc04dd156ee1e61c86a1238bd11707642ea
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Aug 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants