refactor(miniscript): Make fields non-const & private

Makes a lot of fields in miniscript.h non-const in order to allow move-operations 2 commits later.

Also fixes adjacent comment typos.

Co-authored-by: Lőrinc <pap.lorinc@gmail.com>
Co-authored-by: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
This commit is contained in:
Hodlinator
2026-01-03 13:06:00 +01:00
parent 22e4115312
commit c6f798b222
4 changed files with 110 additions and 86 deletions

View File

@@ -305,19 +305,19 @@ std::set<Challenge> FindChallenges(const Node* root)
const auto* ref{stack.back()};
stack.pop_back();
for (const auto& key : ref->keys) {
for (const auto& key : ref->Keys()) {
chal.emplace(ChallengeType::PK, ChallengeNumber(key));
}
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;
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) {
for (const auto& sub : ref->Subs()) {
stack.push_back(sub.get());
}
}