Fix merge conflicts for PR #698 (Circuit Relay v2) #1067
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
Integrated voucher verification and data transfer limits (from HEAD) with SPR validation and protocol improvements (from upstream/main). Key changes: - Merged reservation handling in protocol.py - Fixed peer ID access to use stream.muxed_conn.peer_id - Corrected test to create reservation for destination peer - Fixed type errors: removed .to_pb() call, used CONNECTION_FAILED - All 9 Circuit Relay v2 tests passing
3 tasks
Contributor
|
@LogicalGuy77 : Hi Harshit. While @guha-rahul adds you as a collaborator in the PR: #698: please fix the CI/CD issues remaining. We will close this PR and you can migrate the changes to the main PR. |
Protocol fixes: 1. Fixed is_open() calls that don't exist on NetStream - Simplified error handling in reservation code - Removed unnecessary state checks in cleanup 2. Fixed SPR forwarding from destination to source - Extract destination's SPR from STOP response directly - Forward it to source in HOP STATUS message - Fixes 'Invalid senderRecord' errors 3. Fixed type errors from merge - Removed incorrect .to_pb() call - Changed INTERNAL_ERROR to CONNECTION_FAILED Test fix: 4. Fixed test_circuit_v2_transport_message_routing_through_relay - Added missing reservation step before connecting - Destination now properly reserves with relay - Test now follows correct Circuit Relay v2 flow All 48 relay tests passing (100% success rate) All 9 Circuit Relay v2 protocol tests passing
Contributor
Author
|
@seetadev fixed the ci tests, waiting to be added as collaborator |
Contributor
|
@LogicalGuy77 : Great, hoping Rahul responds soon. He did add Sukhman and Soham as collaborators earlier. |
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.
What was wrong?
This PR resolves merge conflicts and continues the work from #698.
Issue #698
How was it fixed?
Merge Integration:
To-Do
Cute Animal Picture