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

Consolidate bridging logic #48

Merged
merged 6 commits into from
Apr 26, 2024
Merged

Conversation

sisyphusSmiling
Copy link
Contributor

@sisyphusSmiling sisyphusSmiling commented Apr 25, 2024

Closes: #47
Stacked on: #46

Description

Consolidates redundant code between FlowEVMBridge and FlowEVMBridgeHandlers related to fungible token bridging. Also adds helper methods in FlowEVMBridgeUtils to simplify the logic in the core bridge contract. Comments were added to further enhance readability.


For contributor use:

  • Targeted PR against master branch
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
  • Code follows the standards mentioned here.
  • Updated relevant documentation
  • Re-reviewed Files changed in the Github PR explorer
  • Added appropriate labels

@codecov-commenter
Copy link

codecov-commenter commented Apr 25, 2024

Codecov Report

Attention: Patch coverage is 93.33333% with 5 lines in your changes are missing coverage. Please review.

Project coverage is 84.90%. Comparing base (306640a) to head (ae75dff).

Files Patch % Lines
cadence/contracts/bridge/FlowEVMBridgeUtils.cdc 94.44% 3 Missing ⚠️
cadence/contracts/bridge/FlowEVMBridge.cdc 86.66% 2 Missing ⚠️
Additional details and impacted files
@@                     Coverage Diff                      @@
##           add-special-case-handler      #48      +/-   ##
============================================================
- Coverage                     85.47%   84.90%   -0.57%     
============================================================
  Files                            18       18              
  Lines                           819      828       +9     
============================================================
+ Hits                            700      703       +3     
- Misses                          119      125       +6     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sisyphusSmiling sisyphusSmiling marked this pull request as ready for review April 25, 2024 00:10
@sisyphusSmiling sisyphusSmiling requested a review from a team as a code owner April 25, 2024 00:10
Copy link
Member

@joshuahannan joshuahannan left a comment

Choose a reason for hiding this comment

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

Looks pretty good! Just a few small comments

cadence/contracts/bridge/FlowEVMBridgeUtils.cdc Outdated Show resolved Hide resolved
cadence/contracts/bridge/FlowEVMBridgeUtils.cdc Outdated Show resolved Hide resolved
cadence/contracts/bridge/FlowEVMBridgeUtils.cdc Outdated Show resolved Hide resolved
@joshuahannan
Copy link
Member

Feel free to merge this to add-special-case-handler once you've merged consolidate-bridging-logic to this and after I have approved #46

Base automatically changed from add-special-case-handler to main April 26, 2024 19:44
@sisyphusSmiling sisyphusSmiling merged commit 8910028 into main Apr 26, 2024
2 checks passed
@sisyphusSmiling sisyphusSmiling deleted the consolidate-bridging-logic branch April 26, 2024 19:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

Cut down on redundant code
3 participants