refactor: remove duplication from escrow code - #352
Draft
zguesmi wants to merge 7 commits into
Draft
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #352 +/- ##
==========================================
- Coverage 99.53% 99.53% -0.01%
==========================================
Files 31 31
Lines 1077 1069 -8
Branches 206 215 +9
==========================================
- Hits 1072 1064 -8
Misses 5 5 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
After removing native token support the existing architecture is not justifiable anymore.
IexecEscrowTokenFacetnow inherits fromIexecEscrowabstract contract instead of duplicating.Before:
flowchart LR subgraph abstract FacetBase IexecEscrow IexecPocoCommon SignatureVerifier end IexecEscrow --> FacetBase IexecPocoCommon --> FacetBase SignatureVerifier --> FacetBase IexecPoco1Facet --> IexecEscrow & IexecPocoCommon & SignatureVerifier & FacetBase IexecPoco2Facet --> IexecEscrow & SignatureVerifier & FacetBase IexecPocoBoostFacet --> IexecEscrow & IexecPocoCommon & SignatureVerifier & FacetBase IexecPocoAccessorsFacet --> IexecPocoCommon & SignatureVerifier & FacetBase IexecOrderManagementFacet --> SignatureVerifier & FacetBase IexecAccessorsABILegacyFacet --> FacetBase IexecCategoryManagerFacet --> FacetBase IexecConfigurationExtraFacet --> FacetBase IexecConfigurationFacet --> FacetBase IexecEscrowTokenFacet --> FacetBase IexecPocoBoostAccessorsFacet --> FacetBase IexecRelayFacet --> FacetBaseAfter:
flowchart LR subgraph abstract FacetBase IexecEscrow IexecPocoCommon SignatureVerifier end IexecEscrow --> FacetBase IexecPocoCommon --> FacetBase SignatureVerifier --> FacetBase IexecPoco1Facet --> IexecEscrow & IexecPocoCommon & SignatureVerifier IexecPoco2Facet --> IexecEscrow & SignatureVerifier IexecPocoBoostFacet --> IexecEscrow & IexecPocoCommon & SignatureVerifier IexecPocoAccessorsFacet --> IexecPocoCommon & SignatureVerifier IexecOrderManagementFacet --> SignatureVerifier IexecAccessorsABILegacyFacet --> FacetBase IexecCategoryManagerFacet --> FacetBase IexecConfigurationExtraFacet --> FacetBase IexecConfigurationFacet --> FacetBase IexecEscrowTokenFacet --> IexecEscrow IexecPocoBoostAccessorsFacet --> FacetBase IexecRelayFacet --> FacetBase