fix(forge): fix cache search for verification
#7053
Merged
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
klkvr
changed the title
forge): fix cache search for verification
mattsse
approved these changes
Feb 8, 2024
Comment on lines
364
to
366
| let path = match args.contract.path.as_ref() { | ||
| Some(path) => project.root().join(path), | ||
| None => { |
There was a problem hiding this comment.
while we're at it, let's also do if let some else for this
| path.clone(), | ||
| cache | ||
| .entry(&path) | ||
| .ok_or_eyre(format!("Cache entry not found for {}", path.display()))? |
DaniPopes
approved these changes
Feb 8, 2024
| path.clone(), | ||
| cache | ||
| .entry(&path) | ||
| .ok_or_eyre(format!("Cache entry not found for {}", path.display()))? |
There was a problem hiding this comment.
Suggested change
| .ok_or_eyre(format!("Cache entry not found for {}", path.display()))? | |
| .ok_or_else(|| eyre::eyre!("Cache entry not found for {}", path.display()))? |
mattsse
approved these changes
Feb 8, 2024
mattsse
approved these changes
Feb 10, 2024
This was referenced Apr 26, 2024
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.
Motivation
Closes #7042
Solution
Current
EtherscanVerificationProvider::cache_entryalways looks for contract in cache by name, even if path present, this PR fixes it and uses path where possible.