Skip to content

Commit 9729f43

Browse files
committed
fix: allow e2e to run only on L2
Signed-off-by: Tomás Migone <[email protected]>
1 parent 6a9a999 commit 9729f43

File tree

1 file changed

+47
-21
lines changed

1 file changed

+47
-21
lines changed

scripts/e2e

Lines changed: 47 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,40 @@ source $(pwd)/scripts/evm
88
ADDRESS_BOOK=${ADDRESS_BOOK:-"addresses-local.json"}
99
ARBITRUM_ADDRESS_BOOK=${ARBITRUM_ADDRESS_BOOK:-"arbitrum-addresses-local.json"}
1010
ARBITRUM_DEPLOYMENT_FILE=${ARBITRUM_DEPLOYMENT_FILE:-"localNetwork.json"}
11-
L1_NETWORK=${L1_NETWORK:-"localhost"}
12-
L2_NETWORK=${L2_NETWORK} # By default run only L1 tests on localhost network
11+
12+
L1_NETWORK=${L1_NETWORK}
13+
L2_NETWORK=${L2_NETWORK}
14+
1315
L1_GRAPH_CONFIG=${L1_GRAPH_CONFIG:-"config/graph.localhost.yml"}
1416
L2_GRAPH_CONFIG=${L2_GRAPH_CONFIG:-"config/graph.arbitrum-localhost.yml"}
1517

1618
echo "Running e2e tests"
1719
echo "- Using address book: $ADDRESS_BOOK"
18-
echo "- Using L1 network: $L1_NETWORK"
19-
echo "- Using L1 config: $L1_GRAPH_CONFIG"
20+
21+
if [[ -n "$L1_NETWORK" ]]; then
22+
echo "- Using L1 network: $L1_NETWORK"
23+
echo "- Using L1 config: $L1_GRAPH_CONFIG"
24+
else
25+
echo "- No L1_NETWORK provided, skipping L1 tests"
26+
fi
2027

2128
if [[ -n "$L2_NETWORK" ]]; then
2229
echo "- Using L2 network: $L2_NETWORK"
2330
echo "- Using L2 config: $L2_GRAPH_CONFIG"
2431
echo "- Using arbitrum address book: $ARBITRUM_ADDRESS_BOOK"
2532
echo "- Using arbitrum deployment file: $ARBITRUM_DEPLOYMENT_FILE"
2633
else
27-
echo "- Skipping L2 tests"
34+
echo "- No L2_NETWORK provided, skipping L2 tests"
35+
fi
36+
37+
if [[ -z "$L1_NETWORK" ]] && [[ -z "$L2_NETWORK" ]]; then
38+
echo "Must specify one of L1_NETWORK or L2_NETWORK!"
39+
exit 0
40+
fi
41+
42+
if [[ "$L1_NETWORK" == "$L2_NETWORK" ]]; then
43+
echo "L1_NETWORK and L2_NETWORK must be different networks!"
44+
exit 0
2845
fi
2946

3047
### > SCRIPT AUX FUNCTIONS <
@@ -106,9 +123,9 @@ function test_e2e () {
106123
local NETWORK=$1
107124
local GRAPH_CONFIG=$2
108125
local ADDRESS_BOOK=$3
109-
local SKIP_BRIDGE_TESTS=$4
126+
local COUNTERPART_NETWORK=$4
110127

111-
if [[ -z "$SKIP_BRIDGE_TESTS" ]]; then
128+
if [[ -n "$COUNTERPART_NETWORK" ]]; then
112129
npx hardhat e2e --network "$NETWORK" --graph-config "$GRAPH_CONFIG" --address-book "$ADDRESS_BOOK"
113130
else
114131
npx hardhat e2e --network "$NETWORK" --graph-config "$GRAPH_CONFIG" --address-book "$ADDRESS_BOOK" --skip-bridge
@@ -146,7 +163,7 @@ function test_e2e_scenarios_bridge () {
146163
yarn build
147164

148165
# Start evm
149-
if [[ "$L1_NETWORK" == "localhost" ]]; then
166+
if [[ "$L1_NETWORK" == "localhost" || "$L2_NETWORK" == "localhost" ]]; then
150167
evm_kill
151168
evm_start
152169
fi
@@ -163,10 +180,12 @@ fi
163180

164181
## DEPLOY
165182
# Deploy L1
166-
echo "Deploying L1 protocol"
167-
pre_deploy "$L1_NETWORK" "$L1_GRAPH_CONFIG"
168-
deploy "$L1_NETWORK" "$L1_GRAPH_CONFIG" "$ADDRESS_BOOK"
169-
post_deploy "$L1_NETWORK" "$L1_GRAPH_CONFIG" "$ADDRESS_BOOK"
183+
if [[ -n "$L1_NETWORK" ]]; then
184+
echo "Deploying L1 protocol"
185+
pre_deploy "$L1_NETWORK" "$L1_GRAPH_CONFIG"
186+
deploy "$L1_NETWORK" "$L1_GRAPH_CONFIG" "$ADDRESS_BOOK"
187+
post_deploy "$L1_NETWORK" "$L1_GRAPH_CONFIG" "$ADDRESS_BOOK"
188+
fi
170189

171190
# Deploy L2
172191
if [[ -n "$L2_NETWORK" ]]; then
@@ -177,30 +196,37 @@ if [[ -n "$L2_NETWORK" ]]; then
177196
fi
178197

179198
# Configure bridge
180-
if [[ -n "$L2_NETWORK" ]]; then
199+
if [[ -n "$L1_NETWORK" ]] && [[ -n "$L2_NETWORK" ]]; then
181200
configure_bridge "$L1_NETWORK" "$L1_GRAPH_CONFIG" "$L2_NETWORK" "$L2_GRAPH_CONFIG" "$ADDRESS_BOOK" "$ARBITRUM_ADDRESS_BOOK" "$ARBITRUM_DEPLOYMENT_FILE"
182201
fi
183202

184203

185204
## TEST
186205
# Run e2e tests
187-
if [[ -z "$L2_NETWORK" ]]; then
188-
test_e2e "$L1_NETWORK" "$L1_GRAPH_CONFIG" "$ADDRESS_BOOK" true
189-
else
190-
test_e2e "$L1_NETWORK" "$L1_GRAPH_CONFIG" "$ADDRESS_BOOK"
191-
test_e2e "$L2_NETWORK" "$L2_GRAPH_CONFIG" "$ADDRESS_BOOK"
206+
if [[ -n "$L1_NETWORK" ]]; then
207+
test_e2e "$L1_NETWORK" "$L1_GRAPH_CONFIG" "$ADDRESS_BOOK" "$L2_NETWORK"
192208
fi
193209

194-
# Run scenario tests
195-
test_e2e_scenarios "$L1_NETWORK" "$L1_GRAPH_CONFIG" "$ADDRESS_BOOK"
196210
if [[ -n "$L2_NETWORK" ]]; then
211+
test_e2e "$L2_NETWORK" "$L2_GRAPH_CONFIG" "$ADDRESS_BOOK" "$L1_NETWORK"
212+
fi
213+
214+
# Run scenario tests
215+
if [[ -n "$L1_NETWORK" ]]; then
216+
test_e2e_scenarios "$L1_NETWORK" "$L1_GRAPH_CONFIG" "$ADDRESS_BOOK"
217+
fi
218+
219+
if [[ -n "$L1_NETWORK" ]] && [[ -n "$L2_NETWORK" ]]; then
197220
test_e2e_scenarios_bridge "$L1_NETWORK" "$L1_GRAPH_CONFIG" "$L2_NETWORK" "$L2_GRAPH_CONFIG" "$ADDRESS_BOOK"
221+
fi
222+
223+
if [[ -n "$L2_NETWORK" ]]; then
198224
test_e2e_scenarios "$L2_NETWORK" "$L2_GRAPH_CONFIG" "$ADDRESS_BOOK"
199225
fi
200226

201227
## Cleanup
202228
# Exit error mode so the evm instance always gets killed
203-
if [[ "$L1_NETWORK" == "localhost" ]]; then
229+
if [[ "$L1_NETWORK" == "localhost" || "$L2_NETWORK" == "localhost" ]]; then
204230
set +e
205231
result=0
206232

0 commit comments

Comments
 (0)