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

Challenge 2: Fix submodule dependencies #26

Merged
merged 4 commits into from
Dec 16, 2023
Merged

Challenge 2: Fix submodule dependencies #26

merged 4 commits into from
Dec 16, 2023

Conversation

MattPereira
Copy link
Collaborator

@MattPereira MattPereira commented Dec 9, 2023

Fixes #24

Summary

  • Removed all submodules except for cellar-contracts since that's all we need for this challenge. This branch is not dependent on yearn-vaults and @solmate is handled by the following remapping:
@solmate/=lib/cellar-contracts/lib/solmate/src
  • Moved the test folder to root directory because that's where foundry looks for it by default unless you specify otherwise in the foundry.toml. Also may be better practice and easier to find tests if test folder is located at root level of foundry project.

  • Removed all the remappings from foundry.toml to keep all of the remapping logic in one place: remappings.txt

Tips for local review of this PR

  • test/AuraERC4626Adaptor.t.sol is hardcoded to require an env var with the name MAINNET_RPC_URL so you will want to add that to your .env file
  • You may have to remove all of the other submodules completely which I did by manually deleting them from lib/

Proof Test Runs with this PR

image

About the Failing Checks

  1. solidity job is failing because prettier formatting on files that are unchanged by this PR. Its actually not complaining about test/AuraERC4626Adaptor.t.sol because my prettier hit that file with my auto format on save
    image

  2. Foundry Project check is failing because it cant find etherescan api key in environment where github workflow is running
    image

  3. commits job is failing because it doesn't like my commit messages? 😢
    image

@MattPereira MattPereira marked this pull request as ready for review December 11, 2023 03:00
@MattPereira MattPereira changed the title Resolving imports without linting error Challenge 2: Remove all unnecessary submodules Dec 11, 2023
@MattPereira MattPereira changed the title Challenge 2: Remove all unnecessary submodules Challenge 2: Fix submodule dependencies Dec 11, 2023
Copy link
Collaborator

@steve0xp steve0xp left a comment

Choose a reason for hiding this comment

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

Awesome job @MattPereira. Very well detailed work, and the screenshots and walk through were very much appreciated.

I have all tests passing from the test file when specifying to look at the solutions file: import {AuraERC4626Adaptor} from "src/Solutions/AuraERC4626Adaptor.sol"; vs the test file from the "student" at src/AuraERC4626Adaptor.sol.

I think that all the other errors that you described are going to be sorted through as we go into the next step of bringing everything into SE-2, so let's merge this to the branch and move forward!

@MattPereira MattPereira merged commit c28f7b2 into scaffold-eth:challenge-2-sommelier-erc4626-adaptor Dec 16, 2023
0 of 3 checks passed
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.

2 participants