Repository navigation
St v0.2.2 - #11
Merged
Merged
St v0.2.2#11
Conversation
stringhandler
added a commit
that referenced
this pull request
Oct 5, 2026
main moved five commits since this branch was cut, chiefly #11, which ran rustfmt across the crate. Ten files conflicted, lifecycle.rs with 22 hunks, but after rustfmt is applied to the merge base, main's semantic changes to the conflicting files come to two: - lifecycle.rs: amount_uses_fee_keyword becomes pub(crate), for validate - validate.rs: the "nowhere for an L-BTC surplus to go" check, its helper lbtc_surplus_has_a_home, and its tests Resolution: this branch's side of each conflicted file, those two changes ported onto it, then rustfmt on the resolved files so main's formatting is kept rather than undone. The ported tests' fixture now says manifest_version 0.3.0, which this branch requires. CHANGELOG keeps both: [Unreleased] from this branch, then main's [0.2.1]. lib.rs keeps this branch's module list (rustfmt not run on it, since that would recurse into every module). Verified: cargo test --workspace --locked passes (272 lib tests: this branch's 260 plus main's 12); the signet covenant Unlock still builds, satisfies and signs. Not fixed here: main's new surplus check fails examples/deadcat and examples/deadcat_v2, on main alone as well -- no test validates the examples.
stringhandler
added a commit
that referenced
this pull request
Oct 5, 2026
main moved five commits since this branch was cut, chiefly #11, which ran rustfmt across the crate. Ten files conflicted, lifecycle.rs with 22 hunks, but after rustfmt is applied to the merge base, main's semantic changes to the conflicting files come to two: - lifecycle.rs: amount_uses_fee_keyword becomes pub(crate), for validate - validate.rs: the "nowhere for an L-BTC surplus to go" check, its helper lbtc_surplus_has_a_home, and its tests Resolution: this branch's side of each conflicted file, those two changes ported onto it, then rustfmt on the resolved files so main's formatting is kept rather than undone. The ported tests' fixture now says manifest_version 0.3.0, which this branch requires. CHANGELOG keeps both: [Unreleased] from this branch, then main's [0.2.1]. lib.rs keeps this branch's module list (rustfmt not run on it, since that would recurse into every module). Verified: cargo test --workspace --locked passes (272 lib tests: this branch's 260 plus main's 12); the signet covenant Unlock still builds, satisfies and signs. Not fixed here: main's new surplus check fails examples/deadcat and examples/deadcat_v2, on main alone as well -- no test validates the examples.
stringhandler
added a commit
that referenced
this pull request
Oct 5, 2026
main moved five commits since this branch was cut, chiefly #11, which ran rustfmt across the crate. Ten files conflicted, lifecycle.rs with 22 hunks, but after rustfmt is applied to the merge base, main's semantic changes to the conflicting files come to two: - lifecycle.rs: amount_uses_fee_keyword becomes pub(crate), for validate - validate.rs: the "nowhere for an L-BTC surplus to go" check, its helper lbtc_surplus_has_a_home, and its tests Resolution: this branch's side of each conflicted file, those two changes ported onto it, then rustfmt on the resolved files so main's formatting is kept rather than undone. The ported tests' fixture now says manifest_version 0.3.0, which this branch requires. CHANGELOG keeps both: [Unreleased] from this branch, then main's [0.2.1]. lib.rs keeps this branch's module list (rustfmt not run on it, since that would recurse into every module). Verified: cargo test --workspace --locked passes (272 lib tests: this branch's 260 plus main's 12); the signet covenant Unlock still builds, satisfies and signs. Not fixed here: main's new surplus check fails examples/deadcat and examples/deadcat_v2, on main alone as well -- no test validates the examples.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
No description provided.