From 371844dc6e847160828993e5f4fc5aea2b8942cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Negovanovi=C4=87?= Date: Mon, 20 Nov 2023 14:07:12 +0100 Subject: [PATCH] Remove test/Makefile and test/docker-compose.yaml --- test/Makefile | 8 -- test/docker-compose.yaml | 174 --------------------------------------- 2 files changed, 182 deletions(-) delete mode 100644 test/Makefile delete mode 100644 test/docker-compose.yaml diff --git a/test/Makefile b/test/Makefile deleted file mode 100644 index 9e6d0a5..0000000 --- a/test/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -.PHONY: run -run: stop ## Run all the services needed to perform an E2E test - docker compose -f docker-compose.yaml up -d l1 zkevm-prover zkevm-node - docker compose -f docker-compose.yaml up -d --build beethoven - -.PHONY: stop -stop: ## Stop all the services needed to perform an E2E test - docker compose -f docker-compose.yaml down diff --git a/test/docker-compose.yaml b/test/docker-compose.yaml deleted file mode 100644 index 62c78bb..0000000 --- a/test/docker-compose.yaml +++ /dev/null @@ -1,174 +0,0 @@ -version: '3.5' -services: - zkevm-state-db: - image: postgres:16.0-alpine - container_name: zkevm-state-db - command: ["postgres", "-N", "500"] - deploy: - resources: - limits: - memory: 2G - reservations: - memory: 1G - ports: - - 5432:5432 - volumes: - - ./config/init_prover_db.sql:/docker-entrypoint-initdb.d/init.sql - environment: - POSTGRES_USER: state_user - POSTGRES_PASSWORD: state_password - POSTGRES_DB: state_db - healthcheck: - test: [ "CMD-SHELL", "pg_isready", "-d", "prover_db" ] - interval: 30s - timeout: 60s - retries: 5 - start_period: 10s - networks: - - beethoven-localnet - - zkevm-pool-db: - container_name: zkevm-pool-db - image: postgres:16.0-alpine - command: ["postgres", "-N", "500"] - deploy: - resources: - limits: - memory: 2G - reservations: - memory: 1G - ports: - - 5433:5432 - environment: - POSTGRES_USER: pool_user - POSTGRES_PASSWORD: pool_password - POSTGRES_DB: pool_db - healthcheck: - test: [ "CMD-SHELL", "pg_isready", "-d", "pool_db" ] - interval: 30s - timeout: 60s - retries: 5 - start_period: 10s - networks: - - beethoven-localnet - - beethoven-db: - container_name: beethoven-db - image: postgres:16.0-alpine - command: ["postgres", "-N", "500"] - deploy: - resources: - limits: - memory: 2G - reservations: - memory: 1G - ports: - - 5435:5432 - healthcheck: - test: [ "CMD-SHELL", "pg_isready", "-d", "beethoven_db" ] - interval: 30s - timeout: 60s - retries: 5 - start_period: 10s - environment: - POSTGRES_USER: beethoven_user - POSTGRES_PASSWORD: beethoven_password - POSTGRES_DB: beethoven_db - networks: - - beethoven-localnet - restart: always - - zkevm-node: - container_name: zkevm-node - image: hermeznetwork/cdk-validium-node:beethoven - command: - - "/bin/sh" - - "-c" - - "/app/cdk-validium-node approve --network custom --custom-network-file /app/genesis.json --am 115792089237316195423570985008687907853269984665640564039457584007913129639935 -y --cfg /app/config.toml --key-store-path /pk/sequencer.keystore --password testonly && - /app/cdk-validium-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components \"synchronizer,rpc,sequencer,sequence-sender,aggregator,eth-tx-manager,l2gaspricer\"" - ports: - - 8123:8123 - - 61090:61090 - depends_on: - zkevm-state-db: - condition: service_healthy - zkevm-pool-db: - condition: service_healthy - zkevm-prover: - condition: service_started - l1: - condition: service_started - volumes: - - ./config/sequencer.keystore:/pk/sequencer.keystore - - ./config/node.toml:/app/config.toml - - ./config/genesis.json:/app/genesis.json - networks: - - beethoven-localnet - - l1: - container_name: l1 - image: hermeznetwork/geth-cdk-validium-contracts:v0.0.1 - command: - - "--http" - - "--http.api" - - "admin,eth,debug,miner,net,txpool,personal,web3" - - "--http.addr" - - "0.0.0.0" - - "--http.corsdomain" - - "*" - - "--http.vhosts" - - "*" - - "--ws" - - "--ws.origins" - - "*" - - "--ws.addr" - - "0.0.0.0" - - "--dev" - - "--dev.period" - - "1" - - "--datadir" - - "/geth_data" - - "--syncmode" - - "full" - - "--rpc.allow-unprotected-txs" - ports: - - 8545:8545 - - 8546:8546 - networks: - - beethoven-localnet - - zkevm-prover: - container_name: zkevm-prover - image: hermeznetwork/zkevm-prover:v2.2.0 - command: [ - "zkProver", - "-c", - "/usr/src/app/config.json" - ] - depends_on: - zkevm-state-db: - condition: service_healthy - ports: - - 50061:50061 # MT - - 50071:50071 # Executor - volumes: - - ./config/prover.json:/usr/src/app/config.json - networks: - - beethoven-localnet - - beethoven: - container_name: beethoven - image: beethoven - command: [ 'run', '--cfg', '/app/config.toml'] - ports: - - 8444:8444 - volumes: - - ./config/interop.keystore:/pk/interop.keystore - - ./config/beethoven.toml:/app/config.toml - networks: - - beethoven-localnet - restart: always - -networks: - beethoven-localnet: - driver: bridge \ No newline at end of file