Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport: bitcoin#19698, #20079, #20566, #20715, #20868, #21012, #21188, #21200, #21205, #21211, #21293 #6069

Merged
merged 11 commits into from
Jun 21, 2024
Merged

backport: bitcoin#19698, #20079, #20566, #20715, #20868, #21012, #21188, #21200, #21205, #21211, #21293 #6069

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
147d391
Merge #20566: refactor: Use C++17 std::array where possible
Dec 4, 2020
785f731
Merge #20079: p2p: Treat handshake misbehavior like unknown message
Dec 12, 2020
e5249fb
Merge #21012: ci: Fuzz with integer sanitizer
Jan 29, 2021
292861a
Merge #20868: validation: remove redundant check on pindex
Feb 1, 2021
5ec99ff
Merge #20715: util: Add ArgsManager::GetCommand() and use it in bitco…
Feb 4, 2021
e3e6929
Merge #21188: scripted-diff: Remove redundant lock annotations in net…
Feb 17, 2021
91e0359
Merge #21205: build: actually fail when Boost is missing
fanquake Feb 19, 2021
259a767
Merge #21211: test: Move P2WSH_OP_TRUE to shared test library
Feb 19, 2021
5a77c02
Merge #19698: test: apply strict verification flags for transaction t…
laanwj Feb 23, 2021
4ab6aa4
Merge #21293: test: Replace accidentally placed bit-OR with logical-OR
laanwj Feb 24, 2021
4e81732
Merge #21200: test: Speed up rpc_blockchain.py by removing miniwallet…
laanwj Feb 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge bitcoin#21293: test: Replace accidentally placed bit-OR with lo… 
…gical-OR

df8f2a1 test: Replace accidentally placed bit-OR with logical-OR (Hennadii Stepanov)

Pull request description:

  This PR is a follow up of bitcoin#19698.

ACKs for top commit:
  glozow:
    utACK bitcoin@df8f2a1

Tree-SHA512: 36aba3e952850deafe78dd39775a568e89e867c8a352f511f152bce7062f614f5bb4f23266dbb33da5292c9ee6da5ccefce117e3168621c71d2140c8e7f58460
  • Loading branch information
@laanwj @knst
laanwj authored and knst committed Jun 20, 2024
commit 4ab6aa45989ac17183173d569369c7f32ec2a1ea
2 changes: 1 addition & 1 deletion src/test/transaction_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ static std::map<std::string, unsigned int> mapFlagNames = {

unsigned int ParseScriptFlags(std::string strFlags)
{
if (strFlags.empty() | strFlags == "NONE") return 0;
if (strFlags.empty() || strFlags == "NONE") return 0;
unsigned int flags = 0;
std::vector<std::string> words = SplitString(strFlags, ',');

Expand Down