cleanup

.github/workflows/e2e.yml

@@ -48,7 +48,7 @@ jobs:
         run: |
           make tidy
           git submodule update --init --recursive
-          cd tests/e2e/lib/openzeppelin-contracts && git checkout v4.8.0
+          cd tests/e2e/lib/openzeppelin-contracts && git checkout v4.8.0 // this matches the dependency version in hyperlane
           cd ../openzeppelin-contracts-upgradeable && git checkout v4.8.0
           cd ../hyperlane-monorepo/solidity && yarn install --frozen-lockfile
           cd ../../../../.. && make e2e-test

.gitignore

@@ -5,8 +5,8 @@ keys.json.plaintext
 solver.db
 vendor
 .idea
-out
-cache
-broadcast
 config/local/config.yml
 config/local/keys.json
+out
+broadcast
+cache

Makefile

@@ -46,8 +46,8 @@ setup-foundry:
 		foundry-rs/forge-std \
 		OpenZeppelin/[email protected] \
 		OpenZeppelin/[email protected] \
-		hyperlane-xyz/hyperlane-monorepo \
-		--no-commit
+		hyperlane-xyz/hyperlane-monorepo --no-commit \
+		&& cd lib/hyperlane-monorepo/solidity && yarn install --frozen-lockfile
 
 .PHONY: e2e-test
 e2e-test:

README.md

@@ -68,6 +68,8 @@ docker run skip-go-fast-solver
 
 ```shell
 make unit-test
+
+make setup-foundry # install end to end test dependencies
 make e2e-test
 ```
 

tests/e2e/e2e_test.go

@@ -115,7 +115,7 @@ func (s *SolverTestSuite) SetupSuite(ctx context.Context) {
 
 		s.Require().NoError(err, fmt.Sprintf("error deploying contracts: \nstderr: %s\nstdout: %s\nerr: %s", stderr, stdout, err))
 
-		// deploy Hyperlane contracts with a different set of remappings
+		// deploy hyperlane contracts with a different set of remappings
 		hyperlaneDeployOutput, stderr, err := eth.ForgeScript(ctx, s.deployer.KeyName(), ethereum.ForgeScriptOpts{
 			ContractRootDir:  "./tests/e2e",
 			SolidityContract: "scripts/HyperlaneTestDeploy.s.sol:HyperlaneTestDeploy",
@@ -179,7 +179,6 @@ func (s *SolverTestSuite) TestDeploy() {
 	s.SetupSuite(ctx)
 
 	s.Require().True(s.Run("Verify deployment", func() {
-		// Verify that the contracts have been deployed
 		s.Require().True(s.Run("Verify ERC20 Genesis", func() {
 			userBalance, err := s.erc20Contract.BalanceOf(nil, crypto.PubkeyToAddress(s.key.PublicKey))
 			s.Require().NoError(err)