descriptor: remove unreachable verification for pkh

brunoerg · brunoerg · commit e36640859089 · 2024-12-23T08:41:35.000-03:00
diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp
@@ -1787,10 +1787,6 @@ std::vector<std::unique_ptr<DescriptorImpl>> ParseScript(uint32_t& key_exp_index
             ret.emplace_back(std::make_unique<PKHDescriptor>(std::move(pubkey)));
         }
         return ret;
-    } else if (ctx != ParseScriptContext::P2TR && Func("pkh", expr)) {
-        // Under Taproot, always the Miniscript parser deal with it.
-        error = "Can only have pkh at top level, in sh(), wsh(), or in tr()";
-        return {};
     }
     if (ctx == ParseScriptContext::TOP && Func("combo", expr)) {
         auto pubkeys = ParsePubkey(key_exp_index, expr, ctx, out, error);

Original file line number	Diff line number	Diff line change
`@@ -1787,10 +1787,6 @@ std::vector<std::unique_ptr<DescriptorImpl>> ParseScript(uint32_t& key_exp_index`
`1787`	`1787`	`ret.emplace_back(std::make_unique<PKHDescriptor>(std::move(pubkey)));`
`1788`	`1788`	`}`
`1789`	`1789`	`return ret;`
`1790`		`- } else if (ctx != ParseScriptContext::P2TR && Func("pkh", expr)) {`
`1791`		`- // Under Taproot, always the Miniscript parser deal with it.`
`1792`		`- error = "Can only have pkh at top level, in sh(), wsh(), or in tr()";`
`1793`		`- return {};`
`1794`	`1790`	`}`
`1795`	`1791`	`if (ctx == ParseScriptContext::TOP && Func("combo", expr)) {`
`1796`	`1792`	`auto pubkeys = ParsePubkey(key_exp_index, expr, ctx, out, error);`