Skip to content

Commit e610328

Browse files
committed
fix(test): Remove premature block mining
1 parent 43fc827 commit e610328

File tree

1 file changed

+9
-21
lines changed

1 file changed

+9
-21
lines changed

setup-test-network.sh

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@ docker compose up -d graph-contracts
7474
# Wait for contracts to be deployed
7575
timeout 300 bash -c 'until docker ps -a | grep graph-contracts | grep -q "Exited (0)"; do sleep 5; done'
7676

77-
# Before checking the smart contract, ensure they make it to the local network
78-
# by mining some blocks
79-
./scripts/mine-block.sh 100 2>/dev/null || true
80-
8177
# Verify the contracts have code
8278
graph_token_address=$(jq -r '."1337".GraphToken.address' contracts.json)
8379
controller_address=$(jq -r '."1337".Controller.address' contracts.json)
@@ -110,10 +106,6 @@ docker compose up -d indexer-agent
110106
echo "Waiting for indexer-agent to be healthy..."
111107
timeout 300 bash -c 'until docker ps | grep indexer-agent | grep -q healthy; do sleep 5; done'
112108

113-
docker compose up -d indexer-service
114-
echo "Waiting for indexer-service to be healthy..."
115-
timeout 300 bash -c 'until docker ps | grep indexer-service | grep -q healthy; do sleep 5; done'
116-
117109
echo "Starting subgraph deployment..."
118110
docker compose up --build -d subgraph-deploy
119111
sleep 10 # Give time for subgraphs to deploy
@@ -123,10 +115,6 @@ echo "Starting tap-aggregator..."
123115
docker compose up -d tap-aggregator
124116
sleep 10
125117

126-
echo "Starting tap-agent..."
127-
docker compose up -d tap-agent
128-
sleep 10
129-
130118
# tap-escrow-manager requires subgraph-deploy
131119
echo "Starting tap-escrow-manager..."
132120
docker compose up -d tap-escrow-manager
@@ -163,16 +151,17 @@ networks:
163151
EOF
164152

165153
# Build the base image for development(base image:latest)
154+
# This is used for hot reloading
166155
echo "Building base Docker image for development..."
167156
docker build -t indexer-base:latest -f base/Dockerfile ..
168157

169158
# Check to stop any previous instance of indexer-service
170-
# and tap-service
159+
# and tap-agent
171160
echo "Checking for existing conflicting services..."
172-
if docker ps | grep -q "indexer-service\|tap-agent"; then
161+
if docker ps -a | grep -q "indexer-service\|tap-agent\|gateway"; then
173162
echo "Stopping existing indexer-service or tap-agent containers..."
174-
docker stop indexer-service tap-agent 2>/dev/null || true
175-
docker rm indexer-service tap-agent 2>/dev/null || true
163+
docker stop indexer-service tap-agent gateway 2>/dev/null || true
164+
docker rm indexer-service tap-agent gateway 2>/dev/null || true
176165
fi
177166

178167
# Run the custom services using the override file
@@ -182,6 +171,10 @@ rm docker-compose.override.yml
182171
timeout 30 bash -c 'until docker ps | grep indexer | grep -q healthy; do sleep 5; done'
183172
timeout 30 bash -c 'until docker ps | grep tap-agent | grep -q healthy; do sleep 5; done'
184173

174+
# Mine some blocks
175+
# This is important for the gateway
176+
(./local-network/scripts/mine-block.sh 10) 2>/dev/null || true
177+
185178
echo "Building gateway image..."
186179
docker build -t local-gateway:latest ./local-network/gateway
187180

@@ -195,13 +188,8 @@ docker run -d --name gateway \
195188
--restart on-failure:3 \
196189
local-gateway:latest
197190

198-
echo "Waiting for gateway to be healthy..."
199191
echo "Waiting for gateway to be available..."
200192

201-
# Mine some blocks
202-
# This is important for the gateway
203-
./local-network/scripts/mine-block.sh 100 2>/dev/null || true
204-
205193
# Ensure gateway is ready before testing
206194
timeout 300 bash -c 'until curl -f http://localhost:7700/ > /dev/null 2>&1; do echo "Waiting for gateway service..."; sleep 5; done'
207195

0 commit comments

Comments
 (0)