Skip to content

Commit c179199

Browse files
vkjrvkjr
authored
Removed ambiguous "runtime" from compile time var naming (#22623)
1 parent f1f56ba commit c179199

File tree

4 files changed

+35
-38
lines changed

4 files changed

+35
-38
lines changed

‎scripts/build-android.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ SECRETS_ENV_VARS=(
4848
'MIXPANEL_APP_TOKEN'
4949
'POKT_TOKEN'
5050
'SENTRY_DSN_STATUS_GO'
51+
'STATUS_MARKET_DATA_PROXY_URL'
52+
'STATUS_MARKET_DATA_PROXY_USER'
53+
'STATUS_MARKET_DATA_PROXY_PASSWORD'
5154
)
5255

5356
# Secrets like this can't be passed via args or they end up in derivation.

‎shadow-cljs.edn‎

Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,9 @@
6969
status-im.config/INFURA_TOKEN #shadow/env "INFURA_TOKEN"
7070
status-im.config/STATUS_BUILD_PROXY_USER #shadow/env "STATUS_BUILD_PROXY_USER"
7171
status-im.config/STATUS_BUILD_PROXY_PASSWORD #shadow/env "STATUS_BUILD_PROXY_PASSWORD"
72-
status-im.config/STATUS_RUNTIME_MARKET_DATA_PROXY_URL #shadow/env
73-
"STATUS_RUNTIME_MARKET_DATA_PROXY_URL"
74-
status-im.config/STATUS_RUNTIME_MARKET_DATA_PROXY_USER #shadow/env
75-
"STATUS_RUNTIME_MARKET_DATA_PROXY_USER"
76-
status-im.config/STATUS_RUNTIME_MARKET_DATA_PROXY_PASSWORD
77-
#shadow/env "STATUS_RUNTIME_MARKET_DATA_PROXY_PASSWORD"
72+
status-im.config/STATUS_MARKET_DATA_PROXY_URL #shadow/env "STATUS_MARKET_DATA_PROXY_URL"
73+
status-im.config/STATUS_MARKET_DATA_PROXY_USER #shadow/env "STATUS_MARKET_DATA_PROXY_USER"
74+
status-im.config/STATUS_MARKET_DATA_PROXY_PASSWORD #shadow/env "STATUS_MARKET_DATA_PROXY_PASSWORD"
7875
status-im.config/STATUS_BACKEND_SERVER_ENABLED #shadow/env "STATUS_BACKEND_SERVER_ENABLED"
7976
status-im.config/STATUS_BACKEND_SERVER_HOST #shadow/env "STATUS_BACKEND_SERVER_HOST"
8077
status-im.config/STATUS_BACKEND_SERVER_MEDIA_SERVER_ENABLE_TLS
@@ -143,35 +140,32 @@
143140
:chunks {:fleets legacy.status-im.fleet.default-fleet/default-fleets}
144141
:release
145142
{:closure-defines
146-
{status-im.config/POKT_TOKEN #shadow/env "POKT_TOKEN"
147-
status-im.config/INFURA_TOKEN #shadow/env "INFURA_TOKEN"
148-
status-im.config/STATUS_BUILD_PROXY_USER #shadow/env "STATUS_BUILD_PROXY_USER"
149-
status-im.config/STATUS_BUILD_PROXY_PASSWORD #shadow/env "STATUS_BUILD_PROXY_PASSWORD"
143+
{status-im.config/POKT_TOKEN #shadow/env "POKT_TOKEN"
144+
status-im.config/INFURA_TOKEN #shadow/env "INFURA_TOKEN"
145+
status-im.config/STATUS_BUILD_PROXY_USER #shadow/env "STATUS_BUILD_PROXY_USER"
146+
status-im.config/STATUS_BUILD_PROXY_PASSWORD #shadow/env "STATUS_BUILD_PROXY_PASSWORD"
150147
;; market proxy config values (https://github.com/status-im/market-proxy):
151-
status-im.config/STATUS_RUNTIME_MARKET_DATA_PROXY_URL #shadow/env
152-
"STATUS_RUNTIME_MARKET_DATA_PROXY_URL"
153-
status-im.config/STATUS_RUNTIME_MARKET_DATA_PROXY_USER #shadow/env
154-
"STATUS_RUNTIME_MARKET_DATA_PROXY_USER"
155-
status-im.config/STATUS_RUNTIME_MARKET_DATA_PROXY_PASSWORD
156-
#shadow/env "STATUS_RUNTIME_MARKET_DATA_PROXY_PASSWORD"
157-
status-im.config/SENTRY_DSN_STATUS_GO #shadow/env "SENTRY_DSN_STATUS_GO"
158-
status-im.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"
159-
status-im.config/MIXPANEL_APP_ID #shadow/env "MIXPANEL_APP_ID"
160-
status-im.config/MIXPANEL_APP_TOKEN #shadow/env "MIXPANEL_APP_TOKEN"
161-
status-im.config/RARIBLE_MAINNET_API_KEY #shadow/env "RARIBLE_MAINNET_API_KEY"
162-
status-im.config/RARIBLE_TESTNET_API_KEY #shadow/env "RARIBLE_TESTNET_API_KEY"
163-
status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
164-
status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
165-
status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
166-
status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
167-
status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
168-
status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"
169-
status-im.config/ALCHEMY_BASE_MAINNET_TOKEN #shadow/env "ALCHEMY_BASE_MAINNET_TOKEN"
170-
status-im.config/ALCHEMY_BASE_SEPOLIA_TOKEN #shadow/env "ALCHEMY_BASE_SEPOLIA_TOKEN"
171-
status-im.config/STATUS_BUILD_ETH_RPC_PROXY_USER #shadow/env "STATUS_BUILD_ETH_RPC_PROXY_USER"
148+
status-im.config/STATUS_MARKET_DATA_PROXY_URL #shadow/env "STATUS_MARKET_DATA_PROXY_URL"
149+
status-im.config/STATUS_MARKET_DATA_PROXY_USER #shadow/env "STATUS_MARKET_DATA_PROXY_USER"
150+
status-im.config/STATUS_MARKET_DATA_PROXY_PASSWORD #shadow/env "STATUS_MARKET_DATA_PROXY_PASSWORD"
151+
status-im.config/SENTRY_DSN_STATUS_GO #shadow/env "SENTRY_DSN_STATUS_GO"
152+
status-im.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"
153+
status-im.config/MIXPANEL_APP_ID #shadow/env "MIXPANEL_APP_ID"
154+
status-im.config/MIXPANEL_APP_TOKEN #shadow/env "MIXPANEL_APP_TOKEN"
155+
status-im.config/RARIBLE_MAINNET_API_KEY #shadow/env "RARIBLE_MAINNET_API_KEY"
156+
status-im.config/RARIBLE_TESTNET_API_KEY #shadow/env "RARIBLE_TESTNET_API_KEY"
157+
status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
158+
status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
159+
status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
160+
status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
161+
status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
162+
status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"
163+
status-im.config/ALCHEMY_BASE_MAINNET_TOKEN #shadow/env "ALCHEMY_BASE_MAINNET_TOKEN"
164+
status-im.config/ALCHEMY_BASE_SEPOLIA_TOKEN #shadow/env "ALCHEMY_BASE_SEPOLIA_TOKEN"
165+
status-im.config/STATUS_BUILD_ETH_RPC_PROXY_USER #shadow/env "STATUS_BUILD_ETH_RPC_PROXY_USER"
172166
status-im.config/STATUS_BUILD_ETH_RPC_PROXY_PASSWORD #shadow/env
173167
"STATUS_BUILD_ETH_RPC_PROXY_PASSWORD"
174-
status-im.config/STATUS_BUILD_ETH_RPC_PROXY_URL #shadow/env "STATUS_BUILD_ETH_RPC_PROXY_URL"}
168+
status-im.config/STATUS_BUILD_ETH_RPC_PROXY_URL #shadow/env "STATUS_BUILD_ETH_RPC_PROXY_URL"}
175169
:compiler-options {:output-feature-set :es6
176170
;;disable for android build as there
177171
;;is an intermittent warning with deftype

‎src/status_im/config.cljs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
(goog-define POKT_TOKEN "3ef2018191814b7e1009b8d9")
1616
(goog-define STATUS_BUILD_PROXY_USER "")
1717
(goog-define STATUS_BUILD_PROXY_PASSWORD "")
18-
(goog-define STATUS_RUNTIME_MARKET_DATA_PROXY_URL "")
19-
(goog-define STATUS_RUNTIME_MARKET_DATA_PROXY_USER "")
20-
(goog-define STATUS_RUNTIME_MARKET_DATA_PROXY_PASSWORD "")
18+
(goog-define STATUS_MARKET_DATA_PROXY_URL "")
19+
(goog-define STATUS_MARKET_DATA_PROXY_USER "")
20+
(goog-define STATUS_MARKET_DATA_PROXY_PASSWORD "")
2121
(goog-define OPENSEA_API_KEY "")
2222
(goog-define RARIBLE_MAINNET_API_KEY "")
2323
(goog-define RARIBLE_TESTNET_API_KEY "")

‎src/status_im/contexts/profile/config.cljs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
:statusProxyMarketPassword config/STATUS_BUILD_PROXY_PASSWORD
2121
:statusProxyBlockchainUser config/STATUS_BUILD_PROXY_USER
2222
:statusProxyBlockchainPassword config/STATUS_BUILD_PROXY_PASSWORD
23-
:marketDataProxyUrl config/STATUS_RUNTIME_MARKET_DATA_PROXY_URL
24-
:marketDataProxyUser config/STATUS_RUNTIME_MARKET_DATA_PROXY_USER
25-
:marketDataProxyPassword config/STATUS_RUNTIME_MARKET_DATA_PROXY_PASSWORD
23+
:marketDataProxyUrl config/STATUS_MARKET_DATA_PROXY_URL
24+
:marketDataProxyUser config/STATUS_MARKET_DATA_PROXY_USER
25+
:marketDataProxyPassword config/STATUS_MARKET_DATA_PROXY_PASSWORD
2626
:openseaAPIKey config/opensea-api-key
2727
:poktToken config/POKT_TOKEN
2828
:infuraToken config/INFURA_TOKEN

0 commit comments

Comments
 (0)