From 4ab6aa45989ac17183173d569369c7f32ec2a1ea Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@protonmail.com>
Date: Wed, 24 Feb 2021 13:14:13 +0100
Subject: [PATCH] Merge #21293: test: Replace accidentally placed bit-OR with
 logical-OR

df8f2a11dcadd08840c5311631132a522650a83e 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
---
 src/test/transaction_tests.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 57d4f8e4a4..3d8867b551 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -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, ',');