Repository navigation
fix: repair merge corruption breaking CI build, fmt, and tests - #214
Open
The-Big-Danny wants to merge 1 commit into
Open
The-Big-Danny wants to merge 1 commit into
The-Big-Danny wants to merge 1 commit into
Conversation
|
Hey @The-Big-Danny! 👋 It looks like this PR isn't linked to any issue. If this PR is for one of the issues assigned to you as part of a Wave, please link it to ensure your contribution is tracked properly. You can do this by adding a keyword to the PR description (e.g.,
|
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
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.
Summary
The merge of
mainintofix/treasury-self-addressleftdonation-vaultin a broken state.Check formattingfailed first in CI, which masked several deeper issues underneath:set_cancel_grace_ledgersdefinition left an unclosed delimiter;DataKey::CancelGraceLedgersand severalErrorvariants (DepositTooLow,AlreadyPaused,AlreadyUnpaused,SelfStream,StreamCancelled) were declared twice with clashing discriminants, whileStreamLimitExceeded,NgoNotVerified, andStreamCounterMissingwere referenced bycreate_streambut missing from the enum entirely. Reconciled into oneErrorenum with unique discriminants 1-19.last_event(&s.env)snapshot calls were dropped ahead of assertions that referenced them, andcreate_stream_errors_instead_of_defaulting_when_counter_is_missinglost its token mint, causing a token-transfer error to surface asError::SelfStreamby numeric coincidence instead of the intendedStreamCounterMissing. Also restored the truncatedstatus_is_queryable_after_cancel_then_further_operations_failtest and fixedset_fee_bps's event assertion to expect"feeset"(what the contract actually emits) instead of"feebps".donation-vaultdepended on thengo-registrycrate directly to getNgoRegistryClient, which pulledngo-registry's own#[contractimpl]Wasm exports intodonation-vault's link unit and collided with identically-named entry points (admin,init,upgrade) at thewasm32v1-nonebuild step — a latent bug never exercised because formatting always failed first. Replaced with a local#[contractclient]interface declaring just the one methodcreate_streamneeds, removing the crate dependency entirely.Test plan
cargo fmt --all -- --checkcargo clippy --workspace --all-targets -- -D warningscargo doc --workspace --no-deps(withRUSTDOCFLAGS=-D warnings)cargo build --workspace --target wasm32v1-none --releasebash scripts/check-wasm-size.shcargo test --workspace(428 tests across both crates plus doctests, all passing)🤖 Generated with Claude Code