Skip to content

Commit 6134f3b

Browse files
author
IDX GitHub Automation
committed
Automatically fixing code for linting and formatting issues
1 parent ec9147a commit 6134f3b

File tree

3 files changed

+43
-20
lines changed

3 files changed

+43
-20
lines changed

rs/tests/message_routing/rejoin_test_lib/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ rust_library(
1212
"//rs/rust_canisters/dfn_candid",
1313
"//rs/tests/driver:ic-system-test-driver",
1414
"//rs/types/types",
15-
"//rs/universal_canister/lib",
15+
"//rs/universal_canister/lib",
1616
"@crate_index//:anyhow",
1717
"@crate_index//:candid",
1818
"@crate_index//:chrono",

rs/tests/message_routing/rejoin_test_lib/rejoin_test_lib.rs

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ use ic_system_test_driver::driver::test_env_api::get_dependency_path;
66
use ic_system_test_driver::driver::test_env_api::retry_async;
77
use ic_system_test_driver::driver::test_env_api::{HasPublicApiUrl, HasVm, IcNodeSnapshot};
88
use ic_system_test_driver::util::{MetricsFetcher, UniversalCanister, runtime_from_url};
9-
use ic_types::messages::ReplicaHealthStatus;
109
use ic_types::PrincipalId;
11-
use ic_utils::interfaces::management_canister::ManagementCanister;
10+
use ic_types::messages::ReplicaHealthStatus;
1211
use ic_universal_canister::wasm;
12+
use ic_utils::interfaces::management_canister::ManagementCanister;
1313
use slog::info;
1414
use std::collections::BTreeMap;
1515
use 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!(

rs/tests/message_routing/rejoin_test_many_canisters.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ end::catalog[] */
1717

1818
use anyhow::Result;
1919
use ic_registry_subnet_type::SubnetType;
20-
use ic_system_test_driver::driver::group::SystemTestGroup;
2120
use ic_system_test_driver::driver::farm::HostFeature;
21+
use ic_system_test_driver::driver::group::SystemTestGroup;
2222
use ic_system_test_driver::driver::ic::{
2323
AmountOfMemoryKiB, ImageSizeGiB, InternetComputer, NrOfVCPUs, Subnet, VmResources,
2424
};
2525
use ic_system_test_driver::driver::pot_dsl::{PotSetupFn, SysTestFn};
26-
use ic_system_test_driver::driver::simulate_network::{FixedNetworkSimulation, SimulateNetwork};
2726
use ic_system_test_driver::driver::prometheus_vm::{HasPrometheus, PrometheusVm};
27+
use ic_system_test_driver::driver::simulate_network::{FixedNetworkSimulation, SimulateNetwork};
2828
use ic_system_test_driver::driver::test_env::TestEnv;
2929
use ic_system_test_driver::driver::test_env_api::{
3030
HasPublicApiUrl, HasTopologySnapshot, IcNodeContainer,
3131
};
3232
use ic_system_test_driver::systest;
33-
use ic_system_test_driver::util::{get_app_subnet_and_node, block_on};
33+
use ic_system_test_driver::util::{block_on, get_app_subnet_and_node};
3434
use ic_types::Height;
3535
use rejoin_test_lib::rejoin_test_many_canisters;
3636
use std::time::Duration;
@@ -121,10 +121,10 @@ fn setup(env: TestEnv, config: Config) {
121121
});
122122

123123
env.sync_with_prometheus();
124-
/*
125-
let root_subnet = env.topology_snapshot().root_subnet();
126-
root_subnet.apply_network_settings(NETWORK_SIMULATION);
127-
*/
124+
/*
125+
let root_subnet = env.topology_snapshot().root_subnet();
126+
root_subnet.apply_network_settings(NETWORK_SIMULATION);
127+
*/
128128
let topology_snapshot = env.topology_snapshot();
129129
let (app_subnet, _) = get_app_subnet_and_node(&topology_snapshot);
130130

0 commit comments

Comments
 (0)