Skip to content

Conversation

@sanity
Copy link
Collaborator

@sanity sanity commented Nov 7, 2025

Summary

  • switch freenet-test-network dev dependency to the published 0.1.1 crate
  • add reusable integration harness (manual diagnostics + connectivity tests)
  • document how to run the suite locally as part of stacked PR validation

Testing

  • cargo test --test test_network_integration
  • cargo test --test diagnose_connectivity -- --ignored --exact

@sanity sanity force-pushed the feat/test-network-integration branch from 98608c6 to f6552b0 Compare November 7, 2025 21:25
@sanity sanity force-pushed the feat/test-network-integration branch from f6552b0 to caa7b4f Compare November 7, 2025 22:23
@sanity sanity changed the base branch from main to stack/connect-transport-rewrite November 7, 2025 22:24
@sanity sanity force-pushed the stack/connect-transport-rewrite branch from ead6ba4 to d3318b5 Compare November 8, 2025 02:09
@sanity
Copy link
Collaborator Author

sanity commented Nov 8, 2025

@claude please resolve conflicts

@claude
Copy link

claude bot commented Nov 8, 2025

Claude finished @sanity's task —— View job


Merge Conflicts Resolved ✅

  • Check for merge conflicts with base branch
  • Identify conflicting files
  • Apply changes to crates/core/src/node/p2p_impl.rs
  • Apply changes to crates/core/src/operations/connect.rs
  • Apply changes to crates/core/src/node/testing_impl.rs
  • Verify changes match base commit
  • Commit and push resolution

Summary

Successfully resolved merge conflicts by incorporating changes from the base branch (stack/connect-transport-rewrite). The conflicts were caused by commit d3318b5c which added proper shutdown handling for the initial join task.

Changes Applied

crates/core/src/node/p2p_impl.rs:

  • Added JoinHandle import and field to track the background join task
  • Modified run_node() to capture and store the join handle
  • Added cleanup logic to abort the join task when the node shuts down

crates/core/src/operations/connect.rs:

  • Changed initial_join_procedure() return type to Result<JoinHandle<()>, OpError>
  • Captured and returned the spawn handle for the background task
  • Added explanatory comment for courtesy_hint() logic

crates/core/src/node/testing_impl.rs:

  • Updated run_node() to capture and abort the join task on completion

All changes match the base branch commit exactly. The PR branch is now up to date and ready for review.

--- | Branch

github-actions bot and others added 2 commits November 8, 2025 17:23
Merges changes from stack/connect-transport-rewrite base branch to resolve conflicts.

- Add JoinHandle tracking for initial_join_procedure background task
- Ensure proper cleanup on node shutdown by aborting the join task
- Update function signatures and all callers (p2p_impl, testing_impl)
- Add explanatory comment for courtesy_hint logic

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
Co-authored-by: Ian Clarke <sanity@users.noreply.github.com>
Resolved conflicts:
- Added origin field to PutMsg::PutForward in put.rs
- Regenerated Cargo.lock

[AI-assisted - Claude]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants