update

okx · Jun 25, 2024 · 3123382 · 3123382
1 parent bc7f624
commit 3123382
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 272 deletions.
diff --git a/test/Makefile b/test/Makefile
@@ -1,6 +1,5 @@
 DOCKERCOMPOSE := docker-compose -f docker-compose.yml
 DOCKERCOMPOSEAPPSEQ := xlayer-sequencer
-DOCKERCOMPOSEAPPSEQ2 := xlayer-sequencer2
 DOCKERCOMPOSEAPPSEQSENDER := xlayer-sequence-sender
 DOCKERCOMPOSEAPPSIGNER := xlayer-signer
 DOCKERCOMPOSEAPPL2GASP := xlayer-l2gaspricer
@@ -55,7 +54,6 @@ RUNEVENTDB := $(DOCKERCOMPOSE) up -d $(DOCKERCOMPOSEEVENTDB)
 RUNDACDB := $(DOCKERCOMPOSE) up -d $(DOCKERCOMPOSEDACDB)
 RUNDACNODE := $(DOCKERCOMPOSE) up -d $(DOCKERCOMPOSEDACNODE)
 RUNSEQUENCER := $(DOCKERCOMPOSE) up -d $(DOCKERCOMPOSEAPPSEQ)
-RUNSEQUENCER2 := $(DOCKERCOMPOSE) up -d $(DOCKERCOMPOSEAPPSEQ2)
 RUNV1TOV2SEQUENCER := $(DOCKERCOMPOSE) up -d $(DOCKERCOMPOSEAPPSEQV1TOV2)
 RUNSEQUENCESENDER := $(DOCKERCOMPOSE) up -d $(DOCKERCOMPOSEAPPSEQSENDER)
 RUNSIGNER := $(DOCKERCOMPOSE) up -d $(DOCKERCOMPOSEAPPSIGNER)
@@ -697,39 +695,16 @@ run: ## Runs a full node
 	$(RUNL1NETWORK)
 	sleep 1
 	$(RUNZKPROVER)
-	$(RUNAPPROVE)
-	sleep 3
-	$(RUNSYNC)
-	sleep 4
-	$(RUNDACNODE)
-	$(RUNETHTXMANAGER)
-	$(RUNSEQUENCER)
-	#$(RUNSIGNER)
-	$(RUNSEQUENCESENDER)
-	$(RUNL2GASPRICER)
-	$(RUNAGGREGATOR)
-	$(RUNJSONRPC)
-
-.PHONY: run2
-run2: ## Runs a full node
-	$(RUNSTATEDB)
-	$(RUNPOOLDB)
-	$(RUNEVENTDB)
-	$(RUNDACDB)
-	$(RUNL1NETWORK)
-	sleep 1
-	$(RUNMOCKPROVER)
 	$(RUNMOCKPROVER2)
 	$(RUNMOCKPROVER3)
 	$(RUNMOCKPROVER4)
-	$(RUNEXECUTOR)
 	$(RUNAPPROVE)
 	sleep 3
 	$(RUNSYNC)
 	sleep 4
 	$(RUNDACNODE)
 	$(RUNETHTXMANAGER)
-	$(RUNSEQUENCER2)
+	$(RUNSEQUENCER)
 	#$(RUNSIGNER)
 	$(RUNSEQUENCESENDER)
 	$(RUNL2GASPRICER)

diff --git a/test/config/test.prover2.config.json → test/config/test.mock.prover.config.json b/test/config/test.prover2.config.json → test/config/test.mock.prover.config.json
diff --git a/test/config/test.node2.config.toml b/test/config/test.node2.config.toml
diff --git a/test/docker-compose.yml b/test/docker-compose.yml
@@ -66,27 +66,6 @@ services:
       - "-c"
       - "/app/xlayer-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components sequencer"
 
-  xlayer-sequencer2:
-    container_name: xlayer-sequencer2
-    image: xlayer-node
-    ports:
-      - 9092:9091 # needed if metrics enabled
-      - 6060:6060
-      - 6900:6900 # Data stream server
-    environment:
-      - ZKEVM_NODE_STATE_DB_HOST=xlayer-state-db
-      - ZKEVM_NODE_POOL_DB_HOST=xlayer-pool-db
-      - ZKEVM_NODE_MTCLIENT_URI=${ZKEVM_NODE_MTCLIENT_URI:-}
-      - ZKEVM_NODE_EXECUTOR_URI=${ZKEVM_NODE_EXECUTOR_URI:-}
-    volumes:
-      - ./config/test.node2.config.toml:/app/config.toml
-      - ./config/test.genesis.config.json:/app/genesis.json
-      - ./:/datastreamer
-    command:
-      - "/bin/sh"
-      - "-c"
-      - "/app/xlayer-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components sequencer"
-
   xlayer-sequencer-v1tov2:
     container_name: xlayer-sequencer-v1tov2
     image: xlayer-node
@@ -553,7 +532,7 @@ services:
       # - 50051:50051 # Prover
       - 50052:50052 # Mock prover
     volumes:
-      - ./config/test.prover2.config.json:/usr/src/app/config.json
+      - ./config/test.mock.prover.config.json:/usr/src/app/config.json
     command: >
       zkProver -c /usr/src/app/config.json
 
@@ -564,7 +543,7 @@ services:
       # - 50051:50051 # Prover
       - 50252:50052 # Mock prover
     volumes:
-      - ./config/test.prover2.config.json:/usr/src/app/config.json
+      - ./config/test.mock.prover.config.json:/usr/src/app/config.json
     command: >
       zkProver -c /usr/src/app/config.json
 
@@ -575,7 +554,7 @@ services:
       # - 50051:50051 # Prover
       - 50352:50052 # Mock prover
     volumes:
-      - ./config/test.prover2.config.json:/usr/src/app/config.json
+      - ./config/test.mock.prover.config.json:/usr/src/app/config.json
     command: >
       zkProver -c /usr/src/app/config.json
 
@@ -586,7 +565,7 @@ services:
       # - 50051:50051 # Prover
       - 50452:50052 # Mock prover
     volumes:
-      - ./config/test.prover2.config.json:/usr/src/app/config.json
+      - ./config/test.mock.prover.config.json:/usr/src/app/config.json
     command: >
       zkProver -c /usr/src/app/config.json