Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor!: simplify token amount calculations #128

Merged
merged 1 commit into from
Jan 27, 2025
Merged

Conversation

shuhuiluo
Copy link
Owner

@shuhuiluo shuhuiluo commented Jan 27, 2025

Refactor get_output_amount and get_input_amount to remove tuple outputs and streamline logic. Add mutable variants for methods to handle pool state updates effectively. Update dependency versions, bump SDK to 3.4.0, and enhance README with revised usage and benchmark instructions.

Summary by CodeRabbit

  • New Features

    • Updated Uniswap V3 SDK to version 3.4.0
  • Dependencies

    • Updated bigdecimal dependency to version 0.4.7
    • Updated uniswap-sdk-core to version 3.4.0
  • Documentation

    • Added CodeRabbit Pull Request Reviews badge
    • Updated README with clarified benchmarking instructions
    • Simplified docs.rs link
  • Refactor

    • Modified Pool and Trade struct methods to improve state management and type handling

Refactor `get_output_amount` and `get_input_amount` to remove tuple outputs and streamline logic. Add mutable variants for methods to handle pool state updates effectively. Update dependency versions, bump SDK to 3.4.0, and enhance README with revised usage and benchmark instructions.
Copy link
Contributor

coderabbitai bot commented Jan 27, 2025

Walkthrough

Adjusts glasses Greetings! This pull request represents a systematic upgrade to the Uniswap V3 SDK, incrementing the package version from 3.3.0 to 3.4.0. The modifications primarily involve refactoring pool and trade methods to simplify state management, updating dependency versions, and enhancing documentation. Fascinating, isn't it?

Changes

File Change Summary
Cargo.toml - Package version bumped to 3.4.0
- bigdecimal dependency updated to 0.4.7
- uniswap-sdk-core updated to 3.4.0
README.md - CodeRabbit PR review badge added
- Version reference updated
- Documentation clarifications
src/entities/pool.rs - Refactored get_output_amount and get_input_amount methods
- Added get_output_amount_mut and get_input_amount_mut methods
src/entities/trade.rs - Modified method signatures for better type handling
- Updated currency amount processing
examples/from_pool_key_with_tick_data_provider.rs - Simplified output amount retrieval

Sequence Diagram

sequenceDiagram
    participant Pool
    participant Trade
    Pool->>Pool: Update internal state
    Trade->>Pool: Request output/input amount
    Pool-->>Trade: Return calculated amount
Loading

Possibly related PRs

Suggested reviewers

  • malik672

Poem

🧪 SDK's version ascends with grace,
Rust's magic leaves a subtle trace
Methods refined, state now in-place
Uniswap dances with algorithmic embrace
Bazinga! Code's elegant race 🚀


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 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.
    • Generate unit testing code for this file.
    • 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 generate unit testing code for this file.
    • @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 generate unit testing code.
    • @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.

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. (Beta)
  • @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
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🔭 Outside diff range comments (4)
src/entities/pool.rs (3)

Line range hint 300-347: Don't forget the // TODO: update tick data provider.
Great use of mutable state to reflect real swaps. However, the leftover comment begs for completion.

Would you like me to propose a partial solution or open an issue for that?


Line range hint 395-445: A dash of DRY might help.
get_input_amount_mut repeats logic akin to get_output_amount_mut. Consider small shared utility functions to reduce duplication.

- // Entire function logic is duplicated
+ // Extract shared logic into a helper, called from both get_output_amount_mut & get_input_amount_mut

Line range hint 697-707: Most gratifying test coverage.
Ensures direct correctness for USDC→DAI. An optional check for boundary liquidity conditions could be beneficial.

README.md (1)

Line range hint 89-90: The code example requires updating to match the new API!

The example still shows the old tuple destructuring pattern which is now as obsolete as Internet Explorer.

Apply this diff to update the example:

-    let (amount_out, _pool_after) = pool.get_output_amount(&amount_in, None).unwrap();
+    let amount_out = pool.get_output_amount(&amount_in, None).unwrap();
📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 1901dae and ef4555e.

📒 Files selected for processing (5)
  • Cargo.toml (3 hunks)
  • README.md (4 hunks)
  • examples/from_pool_key_with_tick_data_provider.rs (1 hunks)
  • src/entities/pool.rs (8 hunks)
  • src/entities/trade.rs (7 hunks)
🔇 Additional comments (16)
src/entities/pool.rs (5)

257-298: Splendid docstring and streamlined return.
You’ve cleverly removed the redundant updated pool from the returned tuple. This approach is consistent with the new design, minimizing confusion. No immediate concerns.


Line range hint 350-393: Input-amount logic looks symmetrical.
This is a nifty mirror of get_output_amount. Nothing here contradicts my lofty standards.


Line range hint 709-719: DAI→USDC test direction is apt.
You have validated the complementary scenario. Everything is in order.


Line range hint 721-731: Cross-checking partial liquidity?
While this covers the primary path, you might consider a partial liquidity scenario. Just a suggestion.


Line range hint 733-743: Admirable completeness in test coverage.
Nothing contradictory to see here.

src/entities/trade.rs (6)

Line range hint 556-566: Exact input flow is well-defined.
Switching token_amount via pool.get_output_amount is elegantly straightforward. No significant nits.


585-585: Exact output flow is symmetrical.
Employing pool.get_input_amount for the reverse direction is consistent.


676-676: Skipping insufficient liquidity is logical.
This guard ensures best-route logic remains robust. Well done.


714-714: Neat usage of wrapped().
This maintains type consistency without rummaging through references.


769-769: Concise approach for Ok(amount_in) => ....
Yes, that’s exactly how I'd handle it.


807-807: Wrapping user input stands out.
A fine way to unify references and owned values.

Cargo.toml (2)

23-23: Updated bigdecimal is good.
Keeping dependencies up-to-date helps ensure security and feature completeness.


33-33: Synchronized with uniswap-sdk-core 3.4.0.
Harmonizing versions across dependencies is wise. No concerns.

README.md (3)

4-5: Bazinga! The badge modifications are spot on!

The addition of CodeRabbit badge and the simplified docs.rs badge enhance the repository's professional appearance.


53-53: The version increment follows proper semantic versioning!

The bump to 3.4.0 appropriately reflects the breaking changes in the API, as mentioned in the PR title's refactor! prefix.


128-134: The benchmarking documentation exhibits improved clarity!

The addition of specific benchmark execution instructions will assist users in running targeted performance tests. As someone who appreciates precise documentation, I find this modification particularly satisfying.

Cargo.toml Show resolved Hide resolved
@shuhuiluo shuhuiluo merged commit 5bb888a into master Jan 27, 2025
3 checks passed
@shuhuiluo shuhuiluo deleted the token-amount branch January 27, 2025 04:46
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.

1 participant