Skip to content

Commit e400ac5

Browse files
committed
refactor: simplify repeated comparisons in FindChallenges
This obviates that the LHS of the comparison is always the same
1 parent f670836 commit e400ac5

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

src/test/miniscript_tests.cpp

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -308,18 +308,14 @@ std::set<Challenge> FindChallenges(const NodeRef& root)
308308
for (const auto& key : ref->keys) {
309309
chal.emplace(ChallengeType::PK, ChallengeNumber(key));
310310
}
311-
if (ref->fragment == miniscript::Fragment::OLDER) {
312-
chal.emplace(ChallengeType::OLDER, ref->k);
313-
} else if (ref->fragment == miniscript::Fragment::AFTER) {
314-
chal.emplace(ChallengeType::AFTER, ref->k);
315-
} else if (ref->fragment == miniscript::Fragment::SHA256) {
316-
chal.emplace(ChallengeType::SHA256, ChallengeNumber(ref->data));
317-
} else if (ref->fragment == miniscript::Fragment::RIPEMD160) {
318-
chal.emplace(ChallengeType::RIPEMD160, ChallengeNumber(ref->data));
319-
} else if (ref->fragment == miniscript::Fragment::HASH256) {
320-
chal.emplace(ChallengeType::HASH256, ChallengeNumber(ref->data));
321-
} else if (ref->fragment == miniscript::Fragment::HASH160) {
322-
chal.emplace(ChallengeType::HASH160, ChallengeNumber(ref->data));
311+
switch (ref->fragment) {
312+
case Fragment::OLDER: chal.emplace(ChallengeType::OLDER, ref->k); break;
313+
case Fragment::AFTER: chal.emplace(ChallengeType::AFTER, ref->k); break;
314+
case Fragment::SHA256: chal.emplace(ChallengeType::SHA256, ChallengeNumber(ref->data)); break;
315+
case Fragment::RIPEMD160: chal.emplace(ChallengeType::RIPEMD160, ChallengeNumber(ref->data)); break;
316+
case Fragment::HASH256: chal.emplace(ChallengeType::HASH256, ChallengeNumber(ref->data)); break;
317+
case Fragment::HASH160: chal.emplace(ChallengeType::HASH160, ChallengeNumber(ref->data)); break;
318+
default: break;
323319
}
324320
for (const auto& sub : ref->subs) {
325321
stack.push_back(sub.get());

0 commit comments

Comments
 (0)