GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge #21293: test: Replace accidentally placed bit-OR with logical-OR

Browse source 
df8f2a11dc test: Replace accidentally placed bit-OR with logical-OR (Hennadii Stepanov)

Pull request description:

  This PR is a follow up of #19698.

ACKs for top commit:
  glozow:
    utACK https://github.com/bitcoin/bitcoin/pull/21293/commits/df8f2a11dcadd08840c5311631132a522650a83e

Tree-SHA512: 36aba3e952850deafe78dd39775a568e89e867c8a352f511f152bce7062f614f5bb4f23266dbb33da5292c9ee6da5ccefce117e3168621c71d2140c8e7f58460
This commit is contained in:
Wladimir J. van der Laan 2021-02-24 13:14:13 +01:00
commit 9307c588d0
No known key found for this signature in database
GPG key ID: 1E4AED62986CD25D
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/transaction_tests.cpp
View file

@ -63,7 +63,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;
boost::algorithm::split(words, strFlags, boost::algorithm::is_any_of(","));