Feat/dispute and counter refactors - #695
Merged
JSE19 merged 7 commits intoJul 28, 2026
Merged
Conversation
|
@nursetechie Great news! 🎉 Based on an automated assessment of this PR, the linked Wave issue(s) no longer count against your application limits. You can now already apply to more issues while waiting for a review of this PR. Keep up the great work! 🚀 |
The upstream commit 2d22747 introduced several syntax errors in lib.rs and events.rs that caused the CI build to fail: - events.rs: emit_emergency_drain struct literal was missing closing fields (timestamp), braces, and parenthesis before the next #[contracttype] block - lib.rs: duplicate const keyword before MAX_PLATFORM_FEE_BPS - lib.rs: nested/duplicate if-check in validate_payees (total_bps check appeared twice with different operands) - lib.rs: duplicate bps field in multiple Payee struct initializations (bps: BASIS_POINTS and bps: 10_000 both present) - lib.rs: unclosed unwrap_or_else call in get_approved_resolvers - lib.rs: duplicate get_ttl_extension call in create_escrow_with_fallback - lib.rs: a large duplicate impl Escrow block (copy of instructions.rs, admin.rs, disputes.rs, queries.rs content) was pasted into lib.rs while the individual module files were still present, causing 694 conflicting method definitions The fix reconstructs lib.rs from the clean modular structure while preserving all issue-specific additions (JSE-ORG#643-JSE-ORG#646): MAX_APPEALS, ZERO_ADDRESS_STR, BASIS_POINTS, next_escrow_id, and resolve_or_vote_internal. All missing test module declarations from upstream are included. All 387 tests pass.
nursetechie
force-pushed
the
feat/dispute-and-counter-refactors
branch
from
July 28, 2026 00:28
40eafdd to
5128c8a
Compare
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
2 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.
Pull Request Checklist
Thank you for contributing! Please review the following checklist to ensure your PR is ready for review.
closes #643
Summary
Fixes #issueorRelated to #issue.Testing
cargo test).closes Extract duplicate escrow counter logic into shared helper #644
Documentation
Code Quality
cargo fmt).cargo clippy).closes Consolidate resolve_dispute and vote into shared implementation #645
Breaking Changes
Additional Notes
Please ensure all checkboxes are checked before requesting a review.
closes #646