Use threshold in Terminal and Satisfaction #676
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Miniscript rules say that for andor(x,y,z), x must be dissatisfiable (must have the 'd' property). This means that we cannot construct a Miniscript with a non-dissatisfiable first child of an AndOr, because we would get a type-checking error. However we do this check again in CompilerExtData::and_or, for some reason. This is actually the *only* non-threshold-related error path in CompilerExtData::type_check, and getting rid of it will let us eliminate a ton of errors. So remove this. NEXT, we remove the two threshold-related error paths. These are the checks in CompilerExtData::type_check_common which check for k == 0 and for k > n. I *think* these paths are possible, but they are not tested, so we can remove them without breaking our tests. So we remove them here, allowing us to eliminate a ton of Ok(), ? and unwraps. The next commit will use the new Threshold type to make these error paths actually impossible.
tcharding
approved these changes
Apr 7, 2024
heap-coder
added a commit
to heap-coder/rust-miniscript
that referenced
this pull request
Sep 27, 2025
… Satisfaction
6925ae66b9fc9183652c14f660ce3b62ba0707d6 clippy: remove now-unneeded i64 import (Andrew Poelstra)
0fb47b7fcde70e71321d726465b0ff885b20b3b5 satisfaction: use new Threshold type (Andrew Poelstra)
ff8f07769a5cd68cf3c8701d856739f58f00a996 miniscript: use new Threshold type for thresh (Andrew Poelstra)
95f8dacdcf83eec03a485faa790100e5263ea139 compiler: eliminate unused error paths (Andrew Poelstra)
Pull request description:
This completes the "threshold" conversion and completely drops the various ad-hoc error paths related to threshold values (most of which were just random strings).
The next set of PRs will be related to cleaning up errors in general a bit, to strongly-type things and add span information. But I am struggling a bit with how to box the associated error types for the MiniscriptKey types so it may be a while. (Very hard to do this in a std/nostd compatible way and the final result will probably be inconvenient/annoying for users.)
ACKs for top commit:
tcharding:
ACK 6925ae66b9fc9183652c14f660ce3b62ba0707d6
sanket1729:
ACK 6925ae66b9fc9183652c14f660ce3b62ba0707d6
Tree-SHA512: 04344be051cb5b16f691eafdb64818ffd44c9adc15f71ad6c664e9f337dc4ed52be66a540bf5c99eeb4b384a95d93e2518f290b84cf6abf9cb092e789b57a3fa
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This completes the "threshold" conversion and completely drops the various ad-hoc error paths related to threshold values (most of which were just random strings).
The next set of PRs will be related to cleaning up errors in general a bit, to strongly-type things and add span information. But I am struggling a bit with how to box the associated error types for the MiniscriptKey types so it may be a while. (Very hard to do this in a std/nostd compatible way and the final result will probably be inconvenient/annoying for users.)