Skip to content

fix: bedrock itests #2681

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.

Sign up for GitHub

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

Merged
tynes merged 4 commits into from
Jun 3, 2022
Merged

fix: bedrock itests #2681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb1d159
fix: makefile
tynes Jun 3, 2022
f42d571
fix: bedrock itests
tynes Jun 3, 2022
5d0f105
fix: update yarn script
tynes Jun 3, 2022
ac2de68
fix attempt
tynes Jun 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
COMPOSEFLAGS=-d
ITESTS_L2_HOST=http://localhost:9545

build: build-go contracts integration-tests
build: build-go build-ts
.PHONY: build

build-go: submodules op-node op-proposer op-batcher
.PHONY: build-go

build-ts: submodules contracts integration-tests
build-ts: submodules
yarn build
.PHONY: build-ts

submodules:
Expand Down Expand Up @@ -42,14 +43,6 @@ mod-tidy:
cd ./op-e2e && go mod tidy && cd ..
.PHONY: mod-tidy

contracts:
cd ./contracts-bedrock && yarn install && yarn build
.PHONY: contracts

integration-tests:
cd ./packages/integration-tests-bedrock && yarn install && yarn build:contracts
.PHONY: integration-tests

clean:
rm -rf ./bin
.PHONY: clean
Expand All @@ -63,7 +56,7 @@ devnet-down:
.PHONY: devnet-down

devnet-clean:
rm -rf ./contracts-bedrock/deployments/devnetL1
rm -rf ./packages/contracts-bedrock/deployments/devnetL1
rm -rf ./.devnet
cd ./ops-bedrock && docker-compose down
docker volume rm ops-bedrock_l1_data
Expand All @@ -76,12 +69,12 @@ test-unit:
make -C ./op-proposer test
make -C ./op-batcher test
make -C ./op-e2e test
cd ./contracts-bedrock && yarn test
yarn test
.PHONY: test-unit

test-integration:
bash ./ops-bedrock/test-integration.sh \
./contracts-bedrock/deployments/devnetL1
./packages/contracts-bedrock/deployments/devnetL1
.PHONY: test-integration

devnet-genesis:
Expand Down
3 changes: 2 additions & 1 deletion packages/integration-tests-bedrock/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
artifacts
cache
cache
forge-artifacts
8 changes: 8 additions & 0 deletions packages/integration-tests-bedrock/foundry.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[default]
src = 'contracts'
out = 'forge-artifacts'
optimizer = true
optimizer_runs = 999999

extra_output = ['devdoc', 'userdoc', 'metadata', 'storageLayout']
bytecode_hash = "none"
8 changes: 4 additions & 4 deletions packages/integration-tests-bedrock/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
"private": true,
"name": "@eth-optimism/integration-tests-bedrock",
"version": "0.5.10",
"description": "[Optimism] Integration tests",
"description": "[Optimism] Bedrock Integration tests",
"scripts": {
"lint": "yarn lint:fix && yarn lint:check",
"lint:fix": "yarn lint:check --fix",
"lint:check": "eslint . --max-warnings=0",
"build:contracts": "forge build --root . -c contracts -o artifacts",
"build:contracts": "forge build",
"test": "echo 'no unit tests'",
"test:actor": "IS_LIVE_NETWORK=true ts-node actor-tests/lib/runner.ts",
"test:integration:live": "NO_NETWORK=true IS_LIVE_NETWORK=true hardhat --network optimism test",
"clean": "rimraf cache artifacts"
"clean": "rimraf cache artifacts foundry-artifacts"
},
"keywords": [
"optimism",
"ethereum",
"integration",
"tests"
],
"homepage": "https://github.com/ethereum-optimism/optimism/tree/develop/packages/integration-tests#readme",
"homepage": "https://github.com/ethereum-optimism/optimism/tree/develop/packages/integration-tests-bedrock#readme",
"license": "MIT",
"author": "Optimism PBC",
"repository": {
Expand Down
4 changes: 2 additions & 2 deletions packages/integration-tests-bedrock/test/deposit.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { awaitCondition } from '@eth-optimism/core-utils'
/* Imports: Internal */
import { defaultTransactionFactory } from './shared/utils'
import env from './shared/env'
import counterArtifact from '../artifacts/Counter.sol/Counter.json'
import multiDepositorArtifact from '../artifacts/MultiDepositor.sol/MultiDepositor.json'
import counterArtifact from '../forge-artifacts/Counter.sol/Counter.json'
import multiDepositorArtifact from '../forge-artifacts/MultiDepositor.sol/MultiDepositor.json'

describe('Deposits', () => {
let portal: Contract
Expand Down