mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-04-29 14:59:39 -04:00
refactor: simplify repeated comparisons in FindChallenges
This obviates that the LHS of the comparison is always the same
This commit is contained in:
parent
f670836112
commit
e400ac5352
1 changed files with 8 additions and 12 deletions
|
@ -308,18 +308,14 @@ std::set<Challenge> FindChallenges(const NodeRef& root)
|
|||
for (const auto& key : ref->keys) {
|
||||
chal.emplace(ChallengeType::PK, ChallengeNumber(key));
|
||||
}
|
||||
if (ref->fragment == miniscript::Fragment::OLDER) {
|
||||
chal.emplace(ChallengeType::OLDER, ref->k);
|
||||
} else if (ref->fragment == miniscript::Fragment::AFTER) {
|
||||
chal.emplace(ChallengeType::AFTER, ref->k);
|
||||
} else if (ref->fragment == miniscript::Fragment::SHA256) {
|
||||
chal.emplace(ChallengeType::SHA256, ChallengeNumber(ref->data));
|
||||
} else if (ref->fragment == miniscript::Fragment::RIPEMD160) {
|
||||
chal.emplace(ChallengeType::RIPEMD160, ChallengeNumber(ref->data));
|
||||
} else if (ref->fragment == miniscript::Fragment::HASH256) {
|
||||
chal.emplace(ChallengeType::HASH256, ChallengeNumber(ref->data));
|
||||
} else if (ref->fragment == miniscript::Fragment::HASH160) {
|
||||
chal.emplace(ChallengeType::HASH160, ChallengeNumber(ref->data));
|
||||
switch (ref->fragment) {
|
||||
case Fragment::OLDER: chal.emplace(ChallengeType::OLDER, ref->k); break;
|
||||
case Fragment::AFTER: chal.emplace(ChallengeType::AFTER, ref->k); break;
|
||||
case Fragment::SHA256: chal.emplace(ChallengeType::SHA256, ChallengeNumber(ref->data)); break;
|
||||
case Fragment::RIPEMD160: chal.emplace(ChallengeType::RIPEMD160, ChallengeNumber(ref->data)); break;
|
||||
case Fragment::HASH256: chal.emplace(ChallengeType::HASH256, ChallengeNumber(ref->data)); break;
|
||||
case Fragment::HASH160: chal.emplace(ChallengeType::HASH160, ChallengeNumber(ref->data)); break;
|
||||
default: break;
|
||||
}
|
||||
for (const auto& sub : ref->subs) {
|
||||
stack.push_back(sub.get());
|
||||
|
|
Loading…
Add table
Reference in a new issue