Normalize abs paths #370
Merged
Normalize abs paths #370
Conversation
This file contains 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
bohendo
commented
Jan 24, 2023
| @@ -151,7 +151,7 @@ def convert_filename( | |||
| if not filename.is_absolute(): | |||
| filename = cwd.joinpath(filename) | |||
|
|
|||
| absolute = filename | |||
| absolute = Path(os.path.abspath(filename)) | |||
There was a problem hiding this comment.
Key change is here, other changes are just minor additions/fixes to in-line docs
0xalpharush
reviewed
Jan 24, 2023
crytic_compile/utils/naming.py
Outdated
| @@ -151,7 +151,7 @@ def convert_filename( | |||
| if not filename.is_absolute(): | |||
There was a problem hiding this comment.
I think this code can be deleted because it is missing a call to resolve() and the reason this file isn't being found. We should probably favor os.path since it handles symlinks and normalization e.g. here
0xalpharush
reviewed
Jan 24, 2023
Nice catch Troy Co-authored-by: alpharush <[email protected]>
montyly
approved these changes
Mar 10, 2023
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.
In the repro example described by #367, we're searching for eg:
/Users/bohendo/code/github/2023-01-timeswap/node_modules/@openzeppelin/contracts/token/ERC20/ERC20.soland in
compile_unit.filenameswe saved the absolute path:/Users/bohendo/code/github/2023-01-timeswap/packages/v2-option/../../node_modules/@openzeppelin/contracts/token/ERC20/ERC20.solThe extra
../..part must have been preventing our saved path from being found, after normalizing the absolute paths, the repro runs to completion w/out error.Uncertain how to write tests for this to prevent regressions, still not 100% sure why this issue didn't arise in our monorepo tests but, in the meantime, this should fix it.