highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-09-12 05:32:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#36009: miniscript: remove unused context argument from ParseHexStr

Browse Source 
1fdd208c1c miniscript: remove unused context argument from ParseHexStr (fanquake)

Pull request description:

  Remove unused code.

ACKs for top commit:
  stickies-v:
    ACK 1fdd208c1c
  sedited:
    ACK 1fdd208c1c

Tree-SHA512: ae7c87209ec373bb0bebe243c2d31301572c62a4c18bd08580aa2b8eee87906c521b42096a59e6951a1eb3acb42179505dc063bc7b560b9d9c8963dc3e2e4954
This commit is contained in:
merge-script
2026-08-18 18:06:45 +02:00
parent 15a7a4ed7c 1fdd208c1c
commit 0fd515bbb7
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/script/miniscript.h
View File

@@ -1821,9 +1821,7 @@ std::optional<Key> ParseKey(const std::string& func, std::span<const char>& in,
}
/** Parse a hex string fully contained within a fragment with the name given by 'func' */
template<typename Ctx>
std::optional<std::vector<unsigned char>> ParseHexStr(const std::string& func, std::span<const char>& in, const size_t expected_size,
const Ctx& ctx)
inline std::optional<std::vector<unsigned char>> ParseHexStr(const std::string& func, std::span<const char>& in, const size_t expected_size)
{
std::span<const char> expr = script::Expr(in);
if (!script::Func(func, expr)) return {};
@@ -2003,22 +2001,22 @@ inline std::optional<Node<Key>> Parse(std::span<const char> in, const Ctx& ctx)
constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::PK_H, Vector(std::move(*key)));
script_size += 23;
} else if (Const("sha256(", in, /*skip=*/false)) {
std::optional<std::vector<unsigned char>> hash = ParseHexStr("sha256", in, 32, ctx);
std::optional<std::vector<unsigned char>> hash = ParseHexStr("sha256", in, 32);
if (!hash) return {};
constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::SHA256, std::move(*hash));
script_size += 38;
} else if (Const("ripemd160(", in, /*skip=*/false)) {
std::optional<std::vector<unsigned char>> hash = ParseHexStr("ripemd160", in, 20, ctx);
std::optional<std::vector<unsigned char>> hash = ParseHexStr("ripemd160", in, 20);
if (!hash) return {};
constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::RIPEMD160, std::move(*hash));
script_size += 26;
} else if (Const("hash256(", in, /*skip=*/false)) {
std::optional<std::vector<unsigned char>> hash = ParseHexStr("hash256", in, 32, ctx);
std::optional<std::vector<unsigned char>> hash = ParseHexStr("hash256", in, 32);
if (!hash) return {};
constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::HASH256, std::move(*hash));
script_size += 38;
} else if (Const("hash160(", in, /*skip=*/false)) {
std::optional<std::vector<unsigned char>> hash = ParseHexStr("hash160", in, 20, ctx);
std::optional<std::vector<unsigned char>> hash = ParseHexStr("hash160", in, 20);
if (!hash) return {};
constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::HASH160, std::move(*hash));
script_size += 26;