@@ -32,7 +32,7 @@ run-image: build-image ## 🏃 Run the Docker image
3232
3333dev : # # 🏃 Run the ethrex client in DEV_MODE with the InMemory Engine
3434 cargo run --bin ethrex --features dev -- \
35- --network ./test_data /genesis- l1.json \
35+ --network ./fixtures /genesis/ l1.json \
3636 --http.port 8545 \
3737 --http.addr 0.0.0.0 \
3838 --authrpc.port 8551 \
@@ -56,12 +56,12 @@ checkout-ethereum-package: ethereum-package ## 📦 Checkout specific Ethereum p
5656ENCLAVE ?= lambdanet
5757
5858localnet : stop-localnet-silent build-image checkout-ethereum-package # # 🌐 Start local network
59- kurtosis run --enclave $(ENCLAVE ) ethereum-package --args-file test_data /network_params.yaml
59+ kurtosis run --enclave $(ENCLAVE ) ethereum-package --args-file fixtures/network /network_params.yaml
6060 docker logs -f $$(docker ps -q --filter ancestor=ethrex )
6161
6262localnet-client-comparision : stop-localnet-silent build-image checkout-ethereum-package # # 🌐 Start local network
6363 cp crates/blockchain/metrics/provisioning/grafana_provisioning/dashboards/common_dashboards/ethrex_l1_perf.json ethereum-package/src/grafana/ethrex_l1_perf.json
64- kurtosis run --enclave $(ENCLAVE ) ethereum-package --args-file test_data /network_params_client_comparision.yaml
64+ kurtosis run --enclave $(ENCLAVE ) ethereum-package --args-file fixtures/network /network_params_client_comparision.yaml
6565 docker logs -f $$(docker ps -q -n 1 --filter ancestor=ethrex )
6666
6767localnet-assertoor-blob : stop-localnet-silent build-image checkout-ethereum-package # # 🌐 Start local network with assertoor test
@@ -112,9 +112,9 @@ SIM_PARALLELISM ?= 16
112112# The evm can be selected by using seting HIVE_ETHREX_FLAGS='--evm revm' (the default is levm)
113113# The log level can be selected by switching SIM_LOG_LEVEL from 1 up to 4
114114
115- HIVE_CLIENT_FILE := ../test_data /network/hive_clients/ethrex.yml
116- HIVE_CLIENT_FILE_GIT := ../test_data /network/hive_clients/ethrex_git.yml
117- HIVE_CLIENT_FILE_LOCAL := ../test_data /network/hive_clients/ethrex_local.yml
115+ HIVE_CLIENT_FILE := ../fixtures /network/hive_clients/ethrex.yml
116+ HIVE_CLIENT_FILE_GIT := ../fixtures /network/hive_clients/ethrex_git.yml
117+ HIVE_CLIENT_FILE_LOCAL := ../fixtures /network/hive_clients/ethrex_local.yml
118118
119119run-hive : build-image setup-hive # # 🧪 Run Hive testing suite
120120 - cd hive && ./hive --client-file $(HIVE_CLIENT_FILE ) --client ethrex --sim $(SIMULATION ) --sim.limit " $( TEST_PATTERN) " --sim.parallelism $(SIM_PARALLELISM ) --sim.loglevel $(SIM_LOG_LEVEL )
@@ -147,28 +147,28 @@ start-node-with-flamegraph: rm-test-db ## 🚀🔥 Starts an ethrex client used
147147 --features " dev" \
148148 -- \
149149 --evm $$ LEVM \
150- --network test_data /genesis- l2.json \
150+ --network fixtures /genesis/ l2.json \
151151 --http.port 1729 \
152152 --dev \
153153 --datadir test_ethrex
154154
155155load-test : # # 🚧 Runs a load-test. Run make start-node-with-flamegraph and in a new terminal make load-node
156- cargo run --release --manifest-path ./tooling/load_test/Cargo.toml -- -k ./test_data /private_keys.txt -t eth-transfers
156+ cargo run --release --manifest-path ./tooling/load_test/Cargo.toml -- -k ./fixtures/keys /private_keys.txt -t eth-transfers
157157
158158load-test-erc20 :
159- cargo run --release --manifest-path ./tooling/load_test/Cargo.toml -- -k ./test_data /private_keys.txt -t erc20
159+ cargo run --release --manifest-path ./tooling/load_test/Cargo.toml -- -k ./fixtures/keys /private_keys.txt -t erc20
160160
161161load-test-fibonacci :
162- cargo run --release --manifest-path ./tooling/load_test/Cargo.toml -- -k ./test_data /private_keys.txt -t fibonacci
162+ cargo run --release --manifest-path ./tooling/load_test/Cargo.toml -- -k ./fixtures/keys /private_keys.txt -t fibonacci
163163
164164load-test-io :
165- cargo run --release --manifest-path ./tooling/load_test/Cargo.toml -- -k ./test_data /private_keys.txt -t io-heavy
165+ cargo run --release --manifest-path ./tooling/load_test/Cargo.toml -- -k ./fixtures/keys /private_keys.txt -t io-heavy
166166
167167rm-test-db : # # 🛑 Removes the DB used by the ethrex client used for testing
168168 sudo cargo run --release --bin ethrex -- removedb --force --datadir test_ethrex
169169
170- test_data /ERC20/ERC20.bin : # # 🔨 Build the ERC20 contract for the load test
171- solc ./test_data /ERC20.sol -o $@
170+ fixtures /ERC20/ERC20.bin : # # 🔨 Build the ERC20 contract for the load test
171+ solc ./fixtures/contracts/ERC20 /ERC20.sol -o $@
172172
173173sort-genesis-files :
174174 cd ./tooling/genesis && cargo run
0 commit comments