Skip to content

Commit 3dcf7d9

Browse files
authored
[Tooling] Fix: remove duplicate RelayUtil recipe from the makefiles (#459)
## Summary Fix: remove duplicate RelayUtil recipe from the makefiles
1 parent 37acb15 commit 3dcf7d9

File tree

3 files changed

+26
-5
lines changed

3 files changed

+26
-5
lines changed

makefiles/deps.mk

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,15 @@ install_tools: ## Checks for missing local development tools and installs them t
88

99
.PHONY: install_tools_optional
1010
install_tools_optional: ## Checks for and installs optional local development tools (Relay Util, Graphviz, Mockgen)
11-
./local/scripts/install_tools_optional.sh
11+
./local/scripts/install_tools_optional.sh
12+
13+
.PHONY: check_relay_util
14+
# Internal helper: Checks if relay-util is installed locally
15+
check_relay_util:
16+
@if ! command -v relay-util &> /dev/null; then \
17+
echo "####################################################################################################"; \
18+
echo "Relay Util is not installed."; \
19+
echo "To use any Relay Util make targets to send load testing requests please install Relay Util with:"; \
20+
echo "go install github.com/commoddity/relay-util/v2@latest"; \
21+
echo "####################################################################################################"; \
22+
fi

makefiles/test_load.mk

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
check_websocket_load_test:
66
@if ! command -v websocket-load-test &> /dev/null; then \
77
echo "####################################################################################################"; \
8-
echo "Websocket Load Test is not installed." \
9-
echo "To use any Websocket Load Test make targets to send load testing requests please install Websocket Load Test with:"; \
8+
echo "WebSocket Load Test is not installed."; \
9+
echo "To use any WebSocket Load Test make targets to send load testing requests please install WebSocket Load Test with:"; \
1010
echo "go install github.com/commoddity/websocket-load-test@latest"; \
1111
echo "####################################################################################################"; \
1212
fi
1313

1414
.PHONY: test_load__relay_util__local
15-
test_load__relay_util__local: check_path_up check_relay_util debug_view_results_links ## Load test an anvil endpoint with PATH behind GUARD with 10 eth_blockNumber requests. Override service by running: SERVICE_ID=eth make test_load__relay_util__local
15+
test_load__relay_util__local: check_relay_util check_path_up debug_view_results_links ## Load test an anvil endpoint with PATH behind GUARD with 10 eth_blockNumber requests. Override service by running: SERVICE_ID=eth make test_load__relay_util__local
1616
relay-util \
1717
-u http://localhost:3070/v1 \
1818
-H "target-service-id: $${SERVICE_ID:-eth}" \
@@ -31,3 +31,8 @@ test_load__websocket_load_test__local: check_path_up check_websocket_load_test d
3131
--subs "newHeads,newPendingTransactions" \
3232
--count 10 \
3333
--log
34+
35+
###############################
36+
### Makefile imports ###
37+
###############################
38+
include ./deps.mk

makefiles/test_requests.mk

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ test_request__binary__eth__batch: check_path_up_binary ## Test batch request (et
8989
-d '[{"jsonrpc": "2.0", "id": 1, "method": "eth_blockNumber"}, {"jsonrpc": "2.0", "id": 2, "method": "eth_chainId"}, {"jsonrpc": "2.0", "id": 3, "method": "eth_gasPrice"}]'
9090

9191
.PHONY: test_request__binary__relay_util__eth
92-
test_request__binary__relay_util__eth: check_path_up_binary check_relay_util ## Test eth PATH binary with 100 eth_blockNumber requests using relay-util. Override service by running: SERVICE_ID=eth make test_request__binary__relay_util__eth
92+
test_request__binary__relay_util__eth: check_relay_util check_path_up_binary ## Test eth PATH binary with 100 eth_blockNumber requests using relay-util. Override service by running: SERVICE_ID=eth make test_request__binary__relay_util__eth
9393
relay-util \
9494
-u http://localhost:3069/v1 \
9595
-H "Target-Service-Id: $${SERVICE_ID:-eth}" \
@@ -170,3 +170,8 @@ test_disqualified_endpoints__envoy: check_path_up_envoy ## Get list of currently
170170
curl http://localhost:3070/disqualified_endpoints \
171171
-H "Target-Service-Id: eth"
172172
-d '{"jsonrpc": "2.0", "id": 1, "method": "eth_blockNumber" }'
173+
174+
###############################
175+
### Makefile imports ###
176+
###############################
177+
include ./deps.mk

0 commit comments

Comments
 (0)