Skip to content

Commit b177bb3

Browse files
author
Marcin Nowak-Liebiediew
authored
Mnl/fix dependencies links for binaries and canisters (#47)
* rename ic-canister-http-adapter to ic-https-outcalls-adapter * fix download link for ic-stater (use `/binaries/` instead of `/sdk-release/`)
1 parent 3ce8508 commit b177bb3

File tree

12 files changed

+54
-54
lines changed

12 files changed

+54
-54
lines changed

‎e2e/tests-dfx/bitcoin.bash‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ set_local_network_bitcoin_enabled() {
220220
dfx_start --enable-bitcoin --enable-canister-http
221221

222222
assert_file_not_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-btc-adapter-pid"
223-
assert_file_not_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-canister-http-adapter-pid"
223+
assert_file_not_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-https-outcalls-adapter-pid"
224224

225225
install_asset greet
226226
assert_command dfx deploy
@@ -235,7 +235,7 @@ set_local_network_bitcoin_enabled() {
235235
dfx_bootstrap
236236

237237
assert_file_not_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-btc-adapter-pid"
238-
assert_file_not_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-canister-http-adapter-pid"
238+
assert_file_not_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-https-outcalls-adapter-pid"
239239

240240
install_asset greet
241241
assert_command dfx deploy

‎e2e/tests-dfx/canister_http.bash‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ set_shared_local_network_canister_http_empty() {
3838
@test "canister http feature is enabled by default" {
3939
dfx_start
4040

41-
assert_file_not_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-canister-http-adapter-pid"
41+
assert_file_not_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-https-outcalls-adapter-pid"
4242
}
4343

4444
@test "canister http feature is enabled by default with empty json element" {
4545
set_shared_local_network_canister_http_empty
4646

4747
dfx_start
4848

49-
assert_file_not_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-canister-http-adapter-pid"
49+
assert_file_not_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-https-outcalls-adapter-pid"
5050
}
5151

52-
@test "dfx restarts replica when ic-canister-http-adapter restarts" {
52+
@test "dfx restarts replica when ic-https-outcalls-adapter restarts" {
5353
dfx_new hello
5454
dfx_start
5555

@@ -62,7 +62,7 @@ set_shared_local_network_canister_http_empty() {
6262
CANISTER_HTTP_ADAPTER_PID=$(get_canister_http_adapter_pid)
6363

6464
echo "replica pid is $REPLICA_PID"
65-
echo "ic-canister-http-adapter pid is $CANISTER_HTTP_ADAPTER_PID"
65+
echo "ic-https-outcalls-adapter pid is $CANISTER_HTTP_ADAPTER_PID"
6666

6767
kill -KILL "$CANISTER_HTTP_ADAPTER_PID"
6868
assert_process_exits "$CANISTER_HTTP_ADAPTER_PID" 15s
@@ -99,7 +99,7 @@ set_shared_local_network_canister_http_empty() {
9999
assert_command curl --fail http://localhost:"$(get_webserver_port)"/sample-asset.txt?canisterId="$ID"
100100
}
101101

102-
@test "dfx restarts replica when ic-canister-http-adapter restarts - replica and bootstrap" {
102+
@test "dfx restarts replica when ic-https-outcalls-adapter restarts - replica and bootstrap" {
103103
dfx_new hello
104104
dfx_replica
105105
dfx_bootstrap
@@ -114,7 +114,7 @@ set_shared_local_network_canister_http_empty() {
114114

115115
echo "replica pid is $REPLICA_PID"
116116
echo "replica port is $(get_replica_port)"
117-
echo "ic-canister-http-adapter pid is $CANISTER_HTTP_ADAPTER_PID"
117+
echo "ic-https-outcalls-adapter pid is $CANISTER_HTTP_ADAPTER_PID"
118118

119119
kill -KILL "$CANISTER_HTTP_ADAPTER_PID"
120120
assert_process_exits "$CANISTER_HTTP_ADAPTER_PID" 15s
@@ -151,15 +151,15 @@ set_shared_local_network_canister_http_empty() {
151151

152152
dfx_start --enable-canister-http
153153

154-
assert_file_not_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-canister-http-adapter-pid"
154+
assert_file_not_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-https-outcalls-adapter-pid"
155155
}
156156

157157
@test "dfx replica --enable-canister-http with no other configuration succeeds" {
158158
dfx_new hello
159159

160160
dfx_replica --enable-canister-http
161161

162-
assert_file_not_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-canister-http-adapter-pid"
162+
assert_file_not_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-https-outcalls-adapter-pid"
163163
}
164164

165165
@test "can enable http through project default configuration - dfx start" {
@@ -169,7 +169,7 @@ set_shared_local_network_canister_http_empty() {
169169

170170
dfx_start
171171

172-
assert_file_not_empty .dfx/network/local/ic-canister-http-adapter-pid
172+
assert_file_not_empty .dfx/network/local/ic-https-outcalls-adapter-pid
173173
}
174174

175175
@test "can disable http through project default configuration - dfx start" {
@@ -179,7 +179,7 @@ set_shared_local_network_canister_http_empty() {
179179

180180
dfx_start
181181

182-
assert_file_empty .dfx/network/local/ic-canister-http-adapter-pid
182+
assert_file_empty .dfx/network/local/ic-https-outcalls-adapter-pid
183183
}
184184

185185
@test "can enable http through project local network - dfx start" {
@@ -189,7 +189,7 @@ set_shared_local_network_canister_http_empty() {
189189

190190
dfx_start
191191

192-
assert_file_not_empty .dfx/network/local/ic-canister-http-adapter-pid
192+
assert_file_not_empty .dfx/network/local/ic-https-outcalls-adapter-pid
193193
}
194194

195195
@test "can disable http through project local network - dfx start" {
@@ -199,7 +199,7 @@ set_shared_local_network_canister_http_empty() {
199199

200200
dfx_start
201201

202-
assert_file_empty .dfx/network/local/ic-canister-http-adapter-pid
202+
assert_file_empty .dfx/network/local/ic-https-outcalls-adapter-pid
203203
}
204204

205205
@test "can enable http through shared local network - dfx start" {
@@ -208,7 +208,7 @@ set_shared_local_network_canister_http_empty() {
208208

209209
dfx_start
210210

211-
assert_file_not_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-canister-http-adapter-pid"
211+
assert_file_not_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-https-outcalls-adapter-pid"
212212
}
213213

214214
@test "can disable http through shared local network - dfx start" {
@@ -217,7 +217,7 @@ set_shared_local_network_canister_http_empty() {
217217

218218
dfx_start
219219

220-
assert_file_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-canister-http-adapter-pid"
220+
assert_file_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-https-outcalls-adapter-pid"
221221
}
222222

223223

@@ -228,7 +228,7 @@ set_shared_local_network_canister_http_empty() {
228228

229229
dfx_replica
230230

231-
assert_file_not_empty .dfx/network/local/ic-canister-http-adapter-pid
231+
assert_file_not_empty .dfx/network/local/ic-https-outcalls-adapter-pid
232232
}
233233

234234
@test "can disable http through project default configuration - dfx replica" {
@@ -238,7 +238,7 @@ set_shared_local_network_canister_http_empty() {
238238

239239
dfx_replica
240240

241-
assert_file_empty .dfx/network/local/ic-canister-http-adapter-pid
241+
assert_file_empty .dfx/network/local/ic-https-outcalls-adapter-pid
242242
}
243243

244244
@test "can enable http through project local network - dfx replica" {
@@ -248,7 +248,7 @@ set_shared_local_network_canister_http_empty() {
248248

249249
dfx_replica
250250

251-
assert_file_not_empty .dfx/network/local/ic-canister-http-adapter-pid
251+
assert_file_not_empty .dfx/network/local/ic-https-outcalls-adapter-pid
252252
}
253253

254254
@test "can disable http through project local network - dfx replica" {
@@ -258,7 +258,7 @@ set_shared_local_network_canister_http_empty() {
258258

259259
dfx_replica
260260

261-
assert_file_empty .dfx/network/local/ic-canister-http-adapter-pid
261+
assert_file_empty .dfx/network/local/ic-https-outcalls-adapter-pid
262262
}
263263

264264
@test "can enable http through shared local network - dfx replica" {
@@ -267,7 +267,7 @@ set_shared_local_network_canister_http_empty() {
267267

268268
dfx_replica
269269

270-
assert_file_not_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-canister-http-adapter-pid"
270+
assert_file_not_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-https-outcalls-adapter-pid"
271271
}
272272

273273
@test "can disable http through shared local network - dfx replica" {
@@ -276,7 +276,7 @@ set_shared_local_network_canister_http_empty() {
276276

277277
dfx_replica
278278

279-
assert_file_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-canister-http-adapter-pid"
279+
assert_file_empty "$E2E_SHARED_LOCAL_NETWORK_DATA_DIRECTORY/ic-https-outcalls-adapter-pid"
280280
}
281281

282282
@test "dfx starts http adapter with correct log level - project defaults" {

‎e2e/utils/_.bash‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ get_btc_adapter_pid() {
373373
}
374374

375375
get_canister_http_adapter_pid() {
376-
cat "$E2E_NETWORK_DATA_DIRECTORY/ic-canister-http-adapter-pid"
376+
cat "$E2E_NETWORK_DATA_DIRECTORY/ic-https-outcalls-adapter-pid"
377377
}
378378

379379
get_icx_proxy_pid() {

‎nix/sources.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,21 @@
6464
"url": "https://download.dfinity.systems/ic/21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1/binaries/x86_64-linux/ic-btc-adapter.gz",
6565
"url_template": "https://download.dfinity.systems/ic/<rev>/binaries/x86_64-linux/ic-btc-adapter.gz"
6666
},
67-
"ic-canister-http-adapter-x86_64-darwin": {
67+
"ic-https-outcalls-adapter-x86_64-darwin": {
6868
"builtin": false,
6969
"rev": "21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1",
7070
"sha256": "05nrx9b87znmwsxk01am9mfir6fkkc3nbn8spmjxzy0mn1n4xi4v",
7171
"type": "file",
72-
"url": "https://download.dfinity.systems/ic/21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1/binaries/x86_64-darwin/ic-canister-http-adapter.gz",
73-
"url_template": "https://download.dfinity.systems/ic/<rev>/binaries/x86_64-darwin/ic-canister-http-adapter.gz"
72+
"url": "https://download.dfinity.systems/ic/21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1/binaries/x86_64-darwin/ic-https-outcalls-adapter.gz",
73+
"url_template": "https://download.dfinity.systems/ic/<rev>/binaries/x86_64-darwin/ic-https-outcalls-adapter.gz"
7474
},
75-
"ic-canister-http-adapter-x86_64-linux": {
75+
"ic-https-outcalls-adapter-x86_64-linux": {
7676
"builtin": false,
7777
"rev": "21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1",
7878
"sha256": "0ma5p95ns3z1q6d95ka65faawla1l8174y403iv8brpjbcw99jja",
7979
"type": "file",
80-
"url": "https://download.dfinity.systems/ic/21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1/binaries/x86_64-linux/ic-canister-http-adapter.gz",
81-
"url_template": "https://download.dfinity.systems/ic/<rev>/binaries/x86_64-linux/ic-canister-http-adapter.gz"
80+
"url": "https://download.dfinity.systems/ic/21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1/binaries/x86_64-linux/ic-https-outcalls-adapter.gz",
81+
"url_template": "https://download.dfinity.systems/ic/<rev>/binaries/x86_64-linux/ic-https-outcalls-adapter.gz"
8282
},
8383
"ic-nns-init-x86_64-darwin": {
8484
"builtin": false,
@@ -121,16 +121,16 @@
121121
"rev": "21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1",
122122
"sha256": "0c8wpk7h52ppjm85frkc5ya30nbskz3h7z99wzvrc8chahm6lkxs",
123123
"type": "file",
124-
"url": "https://download.dfinity.systems/ic/21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1/sdk-release/x86_64-darwin/ic-starter.gz",
125-
"url_template": "https://download.dfinity.systems/ic/<rev>/sdk-release/x86_64-darwin/ic-starter.gz"
124+
"url": "https://download.dfinity.systems/ic/21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1/binaries/x86_64-darwin/ic-starter.gz",
125+
"url_template": "https://download.dfinity.systems/ic/<rev>/binaries/x86_64-darwin/ic-starter.gz"
126126
},
127127
"ic-starter-x86_64-linux": {
128128
"builtin": false,
129129
"rev": "21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1",
130130
"sha256": "06gd6hbhkm7l7sm5s1vvk2m43859sgwb1zvzkx6y0ghbx7r7767x",
131131
"type": "file",
132-
"url": "https://download.dfinity.systems/ic/21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1/sdk-release/x86_64-linux/ic-starter.gz",
133-
"url_template": "https://download.dfinity.systems/ic/<rev>/sdk-release/x86_64-linux/ic-starter.gz"
132+
"url": "https://download.dfinity.systems/ic/21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1/binaries/x86_64-linux/ic-starter.gz",
133+
"url_template": "https://download.dfinity.systems/ic/<rev>/binaries/x86_64-linux/ic-starter.gz"
134134
},
135135
"icx-proxy-x86_64-darwin": {
136136
"builtin": false,

‎scripts/update-replica.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ niv update ic-admin-x86_64-darwin -a rev=$SHA
1414
niv update ic-admin-x86_64-linux -a rev=$SHA
1515
niv update ic-btc-adapter-x86_64-darwin -a rev=$SHA
1616
niv update ic-btc-adapter-x86_64-linux -a rev=$SHA
17-
niv update ic-canister-http-adapter-x86_64-darwin -a rev=$SHA
18-
niv update ic-canister-http-adapter-x86_64-linux -a rev=$SHA
17+
niv update ic-https-outcalls-adapter-x86_64-darwin -a rev=$SHA
18+
niv update ic-https-outcalls-adapter-x86_64-linux -a rev=$SHA
1919
niv update ic-nns-init-x86_64-darwin -a rev=$SHA
2020
niv update ic-nns-init-x86_64-linux -a rev=$SHA
2121
niv update ic-starter-x86_64-darwin -a rev=$SHA

‎scripts/write-dfx-asset-sources.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ write_replica_rev
8787
motoko_base_sha="$(calculate_sha256 "motoko-base")"
8888
for platform in "darwin" "linux";
8989
do
90-
for name in "ic-ref" "icx-proxy" "ic-admin" "ic-btc-adapter" "ic-canister-http-adapter" "ic-nns-init" "ic-starter" "motoko" "replica" "canister_sandbox" "sandbox_launcher" "sns";
90+
for name in "ic-ref" "icx-proxy" "ic-admin" "ic-btc-adapter" "ic-https-outcalls-adapter" "ic-nns-init" "ic-starter" "motoko" "replica" "canister_sandbox" "sandbox_launcher" "sns";
9191
do
9292
if [[ "$name" == "replica" || "$name" == "canister_sandbox" ]]; then
9393
echo "# The replica and canister_sandbox binaries must have the same revision." >>"$DFX_ASSET_SOURCES"

‎src/dfx-core/src/config/model/local_server_descriptor.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,17 +118,17 @@ impl LocalServerDescriptor {
118118
self.data_directory.join("ic-btc-adapter-socket-path")
119119
}
120120

121-
/// This file contains the configuration for the ic-canister-http-adapter
121+
/// This file contains the configuration for the ic-https-outcalls-adapter
122122
pub fn canister_http_adapter_config_path(&self) -> PathBuf {
123123
self.data_directory.join("ic-canister-http-config.json")
124124
}
125125

126-
/// This file contains the pid of the ic-canister-http-adapter process
126+
/// This file contains the pid of the ic-https-outcalls-adapter process
127127
pub fn canister_http_adapter_pid_path(&self) -> PathBuf {
128-
self.data_directory.join("ic-canister-http-adapter-pid")
128+
self.data_directory.join("ic-https-outcalls-adapter-pid")
129129
}
130130

131-
/// This file contains the PATH of the unix domain socket for the ic-canister-http-adapter
131+
/// This file contains the PATH of the unix domain socket for the ic-https-outcalls-adapter
132132
pub fn canister_http_adapter_socket_holder_path(&self) -> PathBuf {
133133
self.data_directory.join("ic-canister-http-socket-path")
134134
}

‎src/dfx/assets/dfx-asset-sources.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ sha256 = '13c4fd187d4652ead1296a3f67f680bd10f2b025c934cac57f51e3f51f6405d6'
1717
url = 'https://download.dfinity.systems/ic/21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1/binaries/x86_64-darwin/ic-btc-adapter.gz'
1818
sha256 = '1f7ac6784cdd7f5a414d9a483bab6286ec1e67896038194b49d8064e7e8117da'
1919

20-
[x86_64-darwin.ic-canister-http-adapter]
21-
url = 'https://download.dfinity.systems/ic/21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1/binaries/x86_64-darwin/ic-canister-http-adapter.gz'
20+
[x86_64-darwin.ic-https-outcalls-adapter]
21+
url = 'https://download.dfinity.systems/ic/21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1/binaries/x86_64-darwin/ic-https-outcalls-adapter.gz'
2222
sha256 = '9bc44e6cb015f8df65bd1ad965079bd3991c5d4d550530bbe6d5fe8356ead916'
2323

2424
[x86_64-darwin.ic-nns-init]
2525
url = 'https://download.dfinity.systems/ic/f24c7853befe4b85993f61d11df977a4fd721824/binaries/x86_64-darwin/ic-nns-init.gz'
2626
sha256 = 'e1ffb3fc09e7deac60edf344d338ee81c639f65b6a08249946d27dfa3af42dbd'
2727

2828
[x86_64-darwin.ic-starter]
29-
url = 'https://download.dfinity.systems/ic/21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1/sdk-release/x86_64-darwin/ic-starter.gz'
29+
url = 'https://download.dfinity.systems/ic/21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1/binaries/x86_64-darwin/ic-starter.gz'
3030
sha256 = 'ba4f6a2a54902196f7e729fd03c79f7a5930942f6c66575095f78a02cfbc1c31'
3131

3232
[x86_64-darwin.motoko]
@@ -71,16 +71,16 @@ sha256 = '44ee864c9b32783ab66578eb2ec16cb8ab5eb675e620ca6bb954ec5bcd1503af'
7171
url = 'https://download.dfinity.systems/ic/21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1/binaries/x86_64-linux/ic-btc-adapter.gz'
7272
sha256 = '89c6548d230e5f959f3cf08e78f4bf7878cad66f497e70fdc9327ad15c95c601'
7373

74-
[x86_64-linux.ic-canister-http-adapter]
75-
url = 'https://download.dfinity.systems/ic/21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1/binaries/x86_64-linux/ic-canister-http-adapter.gz'
74+
[x86_64-linux.ic-https-outcalls-adapter]
75+
url = 'https://download.dfinity.systems/ic/21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1/binaries/x86_64-linux/ic-https-outcalls-adapter.gz'
7676
sha256 = '4aca94385bf2e685761c80787202a24151ae942b46cd929ac1e10f6d4bba4555'
7777

7878
[x86_64-linux.ic-nns-init]
7979
url = 'https://download.dfinity.systems/ic/f24c7853befe4b85993f61d11df977a4fd721824/binaries/x86_64-linux/ic-nns-init.gz'
8080
sha256 = '4de144c8630d5ca46be067197412a9209c8cedde7be72423425743bb6b1c5175'
8181

8282
[x86_64-linux.ic-starter]
83-
url = 'https://download.dfinity.systems/ic/21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1/sdk-release/x86_64-linux/ic-starter.gz'
83+
url = 'https://download.dfinity.systems/ic/21aa2ba29bf97115aa3cdedecf0655d0cfa64bf1/binaries/x86_64-linux/ic-starter.gz'
8484
sha256 = 'fd9873f2e90b3ee04d9f7fffb0f8d3a9a041aa987b075daa3ef4d4091734ed19'
8585

8686
[x86_64-linux.motoko]

‎src/dfx/assets/prepare_assets.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ async fn download_binaries(
131131
for bin in [
132132
"ic-admin",
133133
"ic-btc-adapter",
134-
"ic-canister-http-adapter",
134+
"ic-https-outcalls-adapter",
135135
"ic-nns-init",
136136
"replica",
137137
"canister_sandbox",

‎src/dfx/src/actors/canister_http_adapter.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pub struct Config {
4141
pub logger: Option<Logger>,
4242
}
4343

44-
/// An actor for the ic-canister-http-adapter process. Publishes information about
44+
/// An actor for the ic-https-outcalls-adapter process. Publishes information about
4545
/// the process starting or restarting, so that other processes can reconnect.
4646
pub struct CanisterHttpAdapter {
4747
config: Config,
@@ -189,7 +189,7 @@ fn canister_http_adapter_start_thread(
189189
if let Some(socket_path) = &config.socket_path {
190190
if socket_path.exists() {
191191
std::fs::remove_file(socket_path)
192-
.expect("Could not remove ic-canister-http-adapter socket");
192+
.expect("Could not remove ic-https-outcalls-adapter socket");
193193
}
194194
}
195195
let last_start = std::time::Instant::now();
@@ -213,22 +213,22 @@ fn canister_http_adapter_start_thread(
213213
ChildOrReceiver::Receiver => {
214214
debug!(
215215
logger,
216-
"Got signal to stop. Killing ic-canister-http-adapter process..."
216+
"Got signal to stop. Killing ic-https-outcalls-adapter process..."
217217
);
218218
let _ = child.kill();
219219
let _ = child.wait();
220220
done = true;
221221
}
222222
ChildOrReceiver::Child => {
223-
debug!(logger, "ic-canister-http-adapter process failed.");
223+
debug!(logger, "ic-https-outcalls-adapter process failed.");
224224
// If it took less than two seconds to exit, wait a bit before trying again.
225225
if std::time::Instant::now().duration_since(last_start) < Duration::from_secs(2)
226226
{
227227
std::thread::sleep(Duration::from_secs(2));
228228
} else {
229229
debug!(
230230
logger,
231-
"Last ic-canister-http-adapter seemed to have been healthy, not waiting..."
231+
"Last ic-https-outcalls-adapter seemed to have been healthy, not waiting..."
232232
);
233233
}
234234
}

0 commit comments

Comments
 (0)