Skip to content

Conversation

@maflcko
Copy link
Member

@maflcko maflcko commented Apr 22, 2020

See the corresponding pull #18612

@fanquake fanquake added the Tests label Apr 22, 2020
@laanwj
Copy link
Member

laanwj commented Apr 22, 2020

ACK faff9e4 provided it passes Travis

@hebasto
Copy link
Member

hebasto commented Apr 22, 2020

feature_fee_estimation.py failed on CentOS build.

@practicalswift
Copy link
Contributor

practicalswift commented Apr 22, 2020

Concept ACK: removed is better than unused (unused can be buggy, removed cannot)

@maflcko
Copy link
Member Author

maflcko commented Apr 22, 2020

feature_fee_estimation.py failed on CentOS build.

Thanks, reported as bug #18737

@DrahtBot
Copy link
Contributor

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@maflcko maflcko merged commit 47b94a3 into bitcoin:master Apr 22, 2020
@maflcko maflcko deleted the 2004-testNoScriptAdd branch April 22, 2020 19:51
Fabcien pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Jan 19, 2021
Summary:
`CScript` is a subclass of bytes. This removes the overloaded implementation of `CScript.__add__` and ensures that it raises an error instead of calling `bytes.__add__`.

This is a backport of Core [[bitcoin/bitcoin#18732 | PR18732]]

Test Plan: `ninja check-functional-extended`

Reviewers: #bitcoin_abc, Fabien

Reviewed By: #bitcoin_abc, Fabien

Differential Revision: https://reviews.bitcoinabc.org/D8960
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 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.

6 participants