@@ -6,10 +6,10 @@ use ic_system_test_driver::driver::test_env_api::get_dependency_path;
66use ic_system_test_driver:: driver:: test_env_api:: retry_async;
77use ic_system_test_driver:: driver:: test_env_api:: { HasPublicApiUrl , HasVm , IcNodeSnapshot } ;
88use ic_system_test_driver:: util:: { MetricsFetcher , UniversalCanister , runtime_from_url} ;
9- use ic_types:: messages:: ReplicaHealthStatus ;
109use ic_types:: PrincipalId ;
11- use ic_utils :: interfaces :: management_canister :: ManagementCanister ;
10+ use ic_types :: messages :: ReplicaHealthStatus ;
1211use ic_universal_canister:: wasm;
12+ use ic_utils:: interfaces:: management_canister:: ManagementCanister ;
1313use slog:: info;
1414use std:: collections:: BTreeMap ;
1515use std:: env;
@@ -219,7 +219,10 @@ pub async fn rejoin_test_large_state(
219219 assert_state_sync_has_happened ( & logger, rejoin_node, base_count) . await ;
220220}
221221
222- async fn deploy_seed_canister ( ic00 : & ManagementCanister < ' _ > , effective_canister_id : PrincipalId ) -> Principal {
222+ async fn deploy_seed_canister (
223+ ic00 : & ManagementCanister < ' _ > ,
224+ effective_canister_id : PrincipalId ,
225+ ) -> Principal {
223226 let seed_canister_id = ic00
224227 . create_canister ( )
225228 . as_provisional_create_with_amount ( None )
@@ -260,7 +263,8 @@ pub async fn rejoin_test_many_canisters(
260263 ) ;
261264 let mut seed_canisters = vec ! [ ] ;
262265 for _ in 0 ..num_seed_canisters {
263- let seed_canister_id = deploy_seed_canister ( & ic00, agent_node. effective_canister_id ( ) ) . await ;
266+ let seed_canister_id =
267+ deploy_seed_canister ( & ic00, agent_node. effective_canister_id ( ) ) . await ;
264268 seed_canisters. push ( seed_canister_id) ;
265269 }
266270
@@ -271,12 +275,12 @@ pub async fn rejoin_test_many_canisters(
271275 let num_canisters_per_seed_canister = num_canisters / num_seed_canisters;
272276 let mut create_many_canisters_futs = vec ! [ ] ;
273277 for seed_canister_id in seed_canisters {
274- let bytes =
275- Encode ! ( & num_canisters_per_seed_canister ) . expect ( "Failed to candid encode argument for a seed canister" ) ;
278+ let bytes = Encode ! ( & num_canisters_per_seed_canister )
279+ . expect ( "Failed to candid encode argument for a seed canister" ) ;
276280 let fut = agent
277- . update ( & seed_canister_id, "create_many_canisters" )
278- . with_arg ( bytes)
279- . call_and_wait ( ) ;
281+ . update ( & seed_canister_id, "create_many_canisters" )
282+ . with_arg ( bytes)
283+ . call_and_wait ( ) ;
280284 create_many_canisters_futs. push ( fut) ;
281285 }
282286 let res = join_all ( create_many_canisters_futs) . await ;
@@ -285,13 +289,32 @@ pub async fn rejoin_test_many_canisters(
285289 }
286290
287291 let num_busy_canisters = 8 ;
288- info ! ( logger, "Deploying {} busy canisters on a node {} ..." ,
292+ info ! (
293+ logger,
294+ "Deploying {} busy canisters on a node {} ..." ,
289295 num_busy_canisters,
290296 agent_node. get_public_url( )
291297 ) ;
292298 for _ in 0 ..num_busy_canisters {
293- let universal_canister = UniversalCanister :: new_with_retries ( & agent, agent_node. effective_canister_id ( ) , & logger) . await ;
294- universal_canister. update ( wasm ( ) . set_heartbeat ( wasm ( ) . instruction_counter_is_at_least ( 1_800_000_000 ) . build ( ) ) . reply ( ) . build ( ) ) . await . expect ( "Failed to set up a busy canister." ) ;
299+ let universal_canister = UniversalCanister :: new_with_retries (
300+ & agent,
301+ agent_node. effective_canister_id ( ) ,
302+ & logger,
303+ )
304+ . await ;
305+ universal_canister
306+ . update (
307+ wasm ( )
308+ . set_heartbeat (
309+ wasm ( )
310+ . instruction_counter_is_at_least ( 1_800_000_000 )
311+ . build ( ) ,
312+ )
313+ . reply ( )
314+ . build ( ) ,
315+ )
316+ . await
317+ . expect ( "Failed to set up a busy canister." ) ;
295318 }
296319
297320 info ! (
0 commit comments