Skip to content

Commit dc6debc

Browse files
relyt29joshuacolvin0gligneul
authored
Remove unused gas dimension system tests and test contracts (#4220)
* refactor: remove unused gas dimension system tests and test contracts * chore: add changelog * refactor: delete gas dimensions contracts from Dockerfile * update geth pin --------- Co-authored-by: Joshua Colvin <[email protected]> Co-authored-by: Gabriel de Quadros Ligneul <[email protected]>
1 parent 045a16d commit dc6debc

File tree

77 files changed

+6
-10546
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+6
-10546
lines changed

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ COPY ./zeroheavy ./zeroheavy
9393
COPY ./contracts-legacy/package.json ./contracts-legacy/yarn.lock ./contracts-legacy/
9494
COPY ./contracts-legacy/src/precompiles/ ./contracts-legacy/src/precompiles/
9595
COPY ./contracts-local/src/precompiles/ ./contracts-local/src/precompiles/
96-
COPY ./contracts-local/gas-dimensions/ ./contracts-local/gas-dimensions/
9796
COPY ./contracts-local/lib/ ./contracts-local/lib/
9897
COPY ./contracts/src/precompiles/ ./contracts/src/precompiles/
9998
COPY ./contracts/package.json ./contracts/yarn.lock ./contracts/

Makefile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -239,11 +239,6 @@ test-go-redis: test-go-deps
239239
.github/workflows/gotestsum.sh --timeout 120m --run TestRedis --nolog -- --test_redis=redis://localhost:6379/0
240240
@printf $(done)
241241

242-
.PHONY: test-go-gas-dimensions
243-
test-go-gas-dimensions: test-go-deps
244-
.github/workflows/gotestsum.sh --timeout 120m --run "TestDim(Log|TxOp)" --tags gasdimensionstest --nolog
245-
@printf $(done)
246-
247242
.PHONY: test-gen-proofs
248243
test-gen-proofs: \
249244
$(arbitrator_test_wasms) \
@@ -605,7 +600,7 @@ contracts/test/prover/proofs/%.json: $(arbitrator_cases)/%.wasm $(prover_bin)
605600
go run solgen/gen.go
606601
@touch $@
607602

608-
.make/solidity: $(DEP_PREDICATE) safe-smart-account/contracts/*/*.sol safe-smart-account/contracts/*.sol contracts/src/*/*.sol contracts-legacy/src/*/*.sol contracts-local/src/*/*.sol contracts-local/gas-dimensions/src/*.sol .make/yarndeps $(ORDER_ONLY_PREDICATE) .make
603+
.make/solidity: $(DEP_PREDICATE) safe-smart-account/contracts/*/*.sol safe-smart-account/contracts/*.sol contracts/src/*/*.sol contracts-legacy/src/*/*.sol contracts-local/src/*/*.sol .make/yarndeps $(ORDER_ONLY_PREDICATE) .make
609604
npm --prefix safe-smart-account run build
610605
yarn --cwd contracts build
611606
yarn --cwd contracts build:forge:yul
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
### Removed
2+
- remove gas dimension tracers, system tests, and mock contracts. Multigas is now in the stf

contracts-local/Makefile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: build build-forge build-forge-sol build-forge-gas-dimensions build-forge-gas-dimensions-yul
1+
.PHONY: build build-forge build-forge-sol
22

33
# Prevent parallel execution of targets, if the same compiler is used at the same time race conditions may occur
44
.NOTPARALLEL:
@@ -8,15 +8,9 @@ install:
88

99
build: build-forge
1010

11-
build-forge: build-forge-sol build-forge-gas-dimensions build-forge-gas-dimensions-yul
11+
build-forge: build-forge-sol
1212

1313
build-forge-sol:
1414
FOUNDRY_PROFILE=default forge build --skip *.yul --skip src/mocks/HostioTest.sol --skip src/mocks/ArbOS11To32UpgradeTest.sol --skip src/mocks/ArbNativeTokenManagerTest.sol && \
1515
FOUNDRY_PROFILE=solc824 forge build src/mocks/HostioTest.sol src/mocks/ArbOS11To32UpgradeTest.sol src/mocks/ArbNativeTokenManagerTest.sol && \
1616
FOUNDRY_PROFILE=default forge build src/precompiles --out out/precompiles
17-
18-
build-forge-gas-dimensions:
19-
FOUNDRY_PROFILE=gas-dimensions forge build
20-
21-
build-forge-gas-dimensions-yul:
22-
FOUNDRY_PROFILE=gas-dimensions-yul forge build --skip *.sol

contracts-local/gas-dimensions/README.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

contracts-local/gas-dimensions/scripts/Balance.s.sol

Lines changed: 0 additions & 22 deletions
This file was deleted.

contracts-local/gas-dimensions/scripts/Call.s.sol

Lines changed: 0 additions & 50 deletions
This file was deleted.

contracts-local/gas-dimensions/scripts/Counter.s.sol

Lines changed: 0 additions & 35 deletions
This file was deleted.

contracts-local/gas-dimensions/scripts/Create.s.sol

Lines changed: 0 additions & 35 deletions
This file was deleted.

contracts-local/gas-dimensions/scripts/DelegateCall.s.sol

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)