Skip to content

Refactor helper functions#235

Merged
leynos merged 3 commits intomainfrom
codex/refactor-drive_with-functions-for-reusability
Aug 1, 2025
Merged

Refactor helper functions#235
leynos merged 3 commits intomainfrom
codex/refactor-drive_with-functions-for-reusability

Conversation

@leynos
Copy link
Copy Markdown
Owner

@leynos leynos commented Aug 1, 2025

Summary

  • centralize frame driving logic for tests
  • note the shared helper in the documentation

Testing

  • make lint
  • make test

https://chatgpt.com/codex/tasks/task_e_688bf673f1f08322ab4e2b7919e6038c

Summary by Sourcery

Centralize frame driving logic for test helpers by extracting a common internal function and refactoring existing drive functions to use it

Enhancements:

  • Extract drive_internal helper to unify duplex stream I/O and frame handling
  • Refactor drive_with_frame, drive_with_frame_mut, and drive_with_bincode to delegate to drive_internal

Documentation:

  • Update documentation to note that all drive helpers delegate to a single internal function for consistent behavior

@sourcery-ai
Copy link
Copy Markdown
Contributor

sourcery-ai Bot commented Aug 1, 2025

Reviewer's Guide

Extract common I/O plumbing into a new drive_internal helper and refactor existing test driver functions and documentation to use it.

Class diagram for refactored test driver helpers

classDiagram
    class WireframeApp {
        +handle_connection(server)
    }
    class drive_internal {
        +drive_internal(server_fn, frames, capacity)
    }
    class drive_with_frame {
        +drive_with_frame(app, frame, capacity)
    }
    class drive_with_frame_mut {
        +drive_with_frame_mut(app, frames, capacity)
    }
    drive_with_frame --|> drive_internal : delegates
    drive_with_frame_mut --|> drive_internal : delegates
    drive_with_frame : WireframeApp app
    drive_with_frame_mut : WireframeApp app
    drive_internal : server_fn
    drive_internal : frames
    drive_internal : capacity
    WireframeApp : handle_connection(server)
Loading

Flow diagram for centralized frame driving logic

flowchart TD
    A[Start test helper] --> B[Call drive_with_frame or drive_with_frame_mut]
    B --> C[Delegate to drive_internal]
    C --> D[Create duplex stream]
    D --> E[Run app.handle_connection on server half]
    D --> F[Write frames to client half]
    F --> G[Shutdown client]
    G --> H[Read response bytes]
    H --> I[Return collected bytes]
Loading

File-Level Changes

Change Details Files
Introduce drive_internal to centralize duplex stream driving logic
  • Define async drive_internal function with server closure, frame loop, shutdown, and result collection
  • Use tokio::join! to run server and client futures concurrently
wireframe_testing/src/helpers.rs
Refactor drive_with_* functions to delegate to drive_internal
  • Replace inline duplex setup, write, shutdown, and read code in drive_with_frame
  • Refactor drive_with_frame_mut to call drive_internal
  • Ensure drive_with_bincode (and any similar helpers) uses the new internal helper
wireframe_testing/src/helpers.rs
Update documentation to reflect shared helper function
  • Revise description to mention delegation to a single internal function
  • Clarify consistent behavior through centralized I/O plumbing
docs/wireframe-testing-crate.md

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Aug 1, 2025

Warning

Rate limit exceeded

@leynos has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 6 minutes and 36 seconds before requesting another review.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

📥 Commits

Reviewing files that changed from the base of the PR and between daecbdd and a889c40.

📒 Files selected for processing (1)
  • wireframe_testing/src/helpers.rs (4 hunks)

Summary by CodeRabbit

  • Documentation
    • Clarified and refined explanations of helper functions in the testing documentation, detailing behaviour and error reporting.
  • Refactor
    • Consolidated internal logic for handling in-memory duplex streams, improving code maintainability and error handling without changing public APIs.
  • Chores
    • Added the futures dependency to the testing crate for improved async support.

Walkthrough

Revise the documentation for wireframe testing helpers to clarify their behaviour and internal delegation. Refactor the Rust helper implementations by introducing a private drive_internal function, consolidating duplicated logic for driving a WireframeApp over a duplex stream. Update existing helpers to delegate to this internal function, streamlining code structure without altering public APIs.

Changes

Cohort / File(s) Change Summary
Documentation Clarification
docs/wireframe-testing-crate.md
Refine descriptions of helper functions for accuracy and clarity; specify delegation to a single internal function for I/O handling.
Helper Logic Refactor
wireframe_testing/src/helpers.rs
Introduce private drive_internal function; replace duplicated logic in helpers with calls to this function; update imports.
Dependency Update
wireframe_testing/Cargo.toml
Add futures crate version "0.3" to dependencies.

Sequence Diagram(s)

sequenceDiagram
    participant Test as Test Helper
    participant Internal as drive_internal
    participant App as WireframeApp (server)
    participant Client as Client Task

    Test->>Internal: Invoke with frames, handler, capacity
    Internal->>App: Run server handler on server half of duplex stream
    Internal->>Client: Write frames, shutdown write half, read output bytes
    App-->>Internal: Process frames, write response
    Client-->>Internal: Collect output bytes
    Internal-->>Test: Return output bytes or error
Loading

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Possibly related PRs

Poem

Refactor flows with care and grace,
Internal helpers take their place.
Docs now clearer, logic neat,
Duplicated code in swift retreat.
Duplex streams in harmony run,
Testing helpers, job well done!
🚂✨

✨ Finishing Touches
  • 📝 Generate Docstrings
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch codex/refactor-drive_with-functions-for-reusability

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai generate unit tests to generate unit tests for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Copy Markdown
Contributor

@sourcery-ai sourcery-ai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @leynos - I've reviewed your changes and found some issues that need to be addressed.

Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments

### Comment 1
<location> `wireframe_testing/src/helpers.rs:36` </location>
<code_context>

 const DEFAULT_CAPACITY: usize = 4096;

+async fn drive_internal<F, Fut>(
+    server_fn: F,
+    frames: Vec<Vec<u8>>,
+    capacity: usize,
+) -> io::Result<Vec<u8>>
+where
+    F: FnOnce(DuplexStream) -> Fut,
+    Fut: std::future::Future<Output = ()> + Send,
+{
+    let (mut client, server) = duplex(capacity);
+    let server_fut = server_fn(server);
+    let client_fut = async {
</code_context>

<issue_to_address>
Error handling for server task failures is no longer present.

With drive_internal, errors or panics in the server future are no longer surfaced, which could hide server-side failures. Please restore error propagation for the server future to prevent silent errors.
</issue_to_address>

### Comment 2
<location> `wireframe_testing/src/helpers.rs:109` </location>
<code_context>
-            format!("server task failed: {e}"),
-        )),
-    }
+    drive_internal(
+        |server| async move { app.handle_connection(server).await },
+        frames,
+        capacity,
+    )
+    .await
 }

</code_context>

<issue_to_address>
Return type of drive_with_frames has changed to io::Result<Vec<u8>> without server error context.

Previously, server task failures were wrapped with a descriptive io::Error, aiding in debugging. The new approach omits this, making server errors less visible to callers.
</issue_to_address>

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Comment thread wireframe_testing/src/helpers.rs
Comment thread wireframe_testing/src/helpers.rs
@leynos
Copy link
Copy Markdown
Owner Author

leynos commented Aug 1, 2025

@coderabbitai review

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Aug 1, 2025

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@leynos
Copy link
Copy Markdown
Owner Author

leynos commented Aug 1, 2025

@coderabbitai review

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Aug 1, 2025

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@leynos leynos merged commit e81c4ad into main Aug 1, 2025
5 checks passed
@leynos leynos deleted the codex/refactor-drive_with-functions-for-reusability branch August 1, 2025 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant