diff --git a/test/Makefile b/test/Makefile index b1d278909d4..40060761cc7 100644 --- a/test/Makefile +++ b/test/Makefile @@ -2,7 +2,6 @@ DOCKER_COMPOSE := docker compose -f docker-compose.yml DOCKER_STATELESS_EXECUTOR := xlayer-executor DOCKER_SEQ_SENDER := xlayer-seqs DOCKER_AGGREGATOR := xlayer-agg -DOCKER_AGGREGATOR_DB := xlayer-agg-db DOCKER_BRIDGE_DB := xlayer-bridge-db DOCKER_BRIDGE_REDIS := xlayer-bridge-redis DOCKER_BRIDGE_ZOOKEEPER := kafka-zookeeper @@ -26,7 +25,6 @@ DOCKER_GRAFANA := grafana RUN_DOCKER_STATELESS_EXECUTOR := $(DOCKER_COMPOSE) up -d $(DOCKER_STATELESS_EXECUTOR) RUN_DOCKER_SEQ_SENDER := $(DOCKER_COMPOSE) up -d $(DOCKER_SEQ_SENDER) RUN_DOCKER_AGGREGATOR := $(DOCKER_COMPOSE) up -d $(DOCKER_AGGREGATOR) -RUN_DOCKER_AGGREGATOR_DB := $(DOCKER_COMPOSE) up -d $(DOCKER_AGGREGATOR_DB) RUN_DOCKER_BRIDGE_DB := $(DOCKER_COMPOSE) up -d $(DOCKER_BRIDGE_DB) RUN_DOCKER_BRIDGE_REDIS := $(DOCKER_COMPOSE) up -d $(DOCKER_BRIDGE_REDIS) RUN_DOCKER_BRIDGE_ZOOKEEPER := $(DOCKER_COMPOSE) up -d $(DOCKER_BRIDGE_ZOOKEEPER) @@ -55,7 +53,6 @@ run: ## Runs a full node $(RUN_DOCKER_L1_NETWORK) $(RUN_DOCKER_DATA_AVAILABILITY_DB) $(RUN_DOCKER_POOL_DB) - $(RUN_DOCKER_AGGREGATOR_DB) sleep 3 $(RUN_DOCKER_DATA_AVAILABILITY) $(RUN_DOCKER_APPROVE) @@ -83,7 +80,6 @@ all: ## Runs a full node $(RUN_DOCKER_L1_NETWORK) $(RUN_DOCKER_DATA_AVAILABILITY_DB) $(RUN_DOCKER_POOL_DB) - $(RUN_DOCKER_AGGREGATOR_DB) $(RUN_DOCKER_BRIDGE_DB) $(RUN_DOCKER_BRIDGE_REDIS) $(RUN_DOCKER_BRIDGE_ZOOKEEPER) diff --git a/test/config/cdk.config.toml b/test/config/cdk.config.toml index 6491b14a0a8..5c4d30bf856 100644 --- a/test/config/cdk.config.toml +++ b/test/config/cdk.config.toml @@ -90,17 +90,10 @@ SettlementBackend = "l1" AggLayerTxTimeout = "5m" AggLayerURL = "" SyncModeOnlyEnabled = false +DBPath = "/tmp/cdk/aggregator.sqlite" [Aggregator.SequencerPrivateKey] Path = "/pk/sequencer.keystore" Password = "testonly" - [Aggregator.DB] - Name = "aggregator_db" - User = "aggregator_user" - Password = "aggregator_password" - Host = "xlayer-agg-db" - Port = "5432" - EnableLog = false - MaxConns = 200 [Aggregator.Log] Environment = "development" # "production" or "development" Level = "info" diff --git a/test/docker-compose.yml b/test/docker-compose.yml index 914485ad82b..c2bf44a798e 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -19,7 +19,7 @@ services: xlayer-seqs: container_name: xlayer-seqs - image: zjg555543/cdk:v0.4.0-beta10 + image: zjg555543/cdk:dev-v0.5.0-beta6 volumes: - ./data/seqs:/tmp/cdk - ./keystore/da.permit.keystore:/pk/da.permit.keystore @@ -33,7 +33,7 @@ services: xlayer-agg: container_name: xlayer-agg - image: zjg555543/cdk:v0.4.0-beta10 + image: zjg555543/cdk:dev-v0.5.0-beta6 ports: - 50081:50081 volumes: @@ -46,32 +46,6 @@ services: - "-c" - "/usr/local/bin/cdk-node run --cfg /app/config.toml --custom-network-file /app/genesis.json --components aggregator" - xlayer-agg-db: - container_name: xlayer-agg-db - image: postgres:15 - deploy: - resources: - limits: - memory: 2G - reservations: - memory: 1G - ports: - - 5434:5432 - environment: - - POSTGRES_USER=aggregator_user - - POSTGRES_PASSWORD=aggregator_password - - POSTGRES_DB=aggregator_db - command: - - "postgres" - - "-N" - - "500" - healthcheck: - test: ["CMD-SHELL", "pg_isready -U aggregator_user -d aggregator_db"] - interval: 5s - timeout: 5s - retries: 5 - start_period: 5s - xlayer-prover: container_name: xlayer-prover image: hermeznetwork/zkevm-prover:v9.0.0-RC1-fork.13