Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions rs/boundary_node/rate_limits/canister/add_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ impl<A: CanisterApi> AddsConfig for ConfigAdder<A> {
}

fn generate_random_uuid() -> Result<Uuid, anyhow::Error> {
let mut buf = [0u8; 16];
let mut buf = [0_u8; 16];
getrandom::getrandom(&mut buf)
.map_err(|e| anyhow::anyhow!(e))
.context("Failed to generate random bytes")?;
Expand Down Expand Up @@ -269,7 +269,7 @@ mod tests {
// A comprehensive test for adding new rate-limit configs
#[test]
fn test_add_config_success() {
let current_time = 10u64;
let current_time = 10_u64;
let schema_version = 1;
let canister_state = CanisterState::from_static();
// Add init config_1 corresponding to version=1 to the canister state
Expand Down Expand Up @@ -546,7 +546,7 @@ mod tests {
#[test]
fn test_add_config_fails_with_invalid_inputs() {
// Arrange
let current_time = 10u64;
let current_time = 10_u64;
let canister_state = CanisterState::from_static();
let invalid_config_1 = api::InputConfig {
schema_version: 1,
Expand Down Expand Up @@ -620,7 +620,7 @@ mod tests {
// Arrange
let canister_state = CanisterState::from_static();
let adder = ConfigAdder::new(canister_state);
let current_time = 10u64;
let current_time = 10_u64;
let config = api::InputConfig {
schema_version: 1,
rules: vec![],
Expand Down Expand Up @@ -674,7 +674,7 @@ mod tests {
};
// Act & assert
let adder = ConfigAdder::new(canister_state);
let error = adder.add_config(config, 1u64).unwrap_err();
let error = adder.add_config(config, 1_u64).unwrap_err();
assert!(
matches!(error, AddConfigError::LinkingRuleToDisclosedIncident{index, incident_id} if index == 1 && incident_id == incident_id_2)
);
Expand Down
14 changes: 7 additions & 7 deletions rs/boundary_node/rate_limits/canister/disclose.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ mod tests {
fn test_disclose_rules_incidents_succeeds() {
with_canister_state(|state| {
// Disclosure times
let current_time_1 = 10u64;
let current_time_2 = 15u64;
let current_time_3 = 20u64;
let current_time_1 = 10_u64;
let current_time_2 = 15_u64;
let current_time_3 = 20_u64;
// Five rules
let rule_id_1 = RuleId(Uuid::new_v4());
let rule_id_2 = RuleId(Uuid::new_v4());
Expand All @@ -150,9 +150,9 @@ mod tests {
let rule_id_5 = RuleId(Uuid::new_v4());
// Two rules are disclosed, and three are not
let rule_1 = create_mock_rule(None);
let rule_2 = create_mock_rule(Some(25u64));
let rule_2 = create_mock_rule(Some(25_u64));
let rule_3 = create_mock_rule(None);
let rule_4 = create_mock_rule(Some(30u64));
let rule_4 = create_mock_rule(Some(30_u64));
let rule_5 = create_mock_rule(None);
// Two incidents
let incident_id_1 = IncidentId(Uuid::new_v4());
Expand Down Expand Up @@ -228,7 +228,7 @@ mod tests {
#[test]
fn test_disclose_fails_with_invalid_input() {
// Arrange
let current_time = 10u64;
let current_time = 10_u64;
let id_1 = Uuid::new_v4();
let id_2 = "not_a_uuid".to_string();
let arg_1 =
Expand All @@ -249,7 +249,7 @@ mod tests {
#[test]
fn test_disclose_fails_with_id_not_found() {
// Arrange
let current_time = 10u64;
let current_time = 10_u64;
let uuid = Uuid::new_v4();
let arg_1 = rate_limits_api::DiscloseRulesArg::RuleIds(vec![uuid.to_string()]);
let arg_2 = rate_limits_api::DiscloseRulesArg::IncidentIds(vec![uuid.to_string()]);
Expand Down
2 changes: 1 addition & 1 deletion rs/ic_os/networking/deterministic_ips/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ impl MacAddr6Ext for MacAddr6 {
let mac_octets = self.into_array();

// Create the EUI-64 interface identifier
let mut interface_id = [0u8; 8];
let mut interface_id = [0_u8; 8];

// Flip the Universal/Local bit in the first octet
interface_id[0] = mac_octets[0] ^ 0x02;
Expand Down
6 changes: 3 additions & 3 deletions rs/ic_os/open_rootfs/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ use uuid::Uuid;
const BASE_ROOTFS_HASH: &str = "ba5e";
const RECOVERY_ROOTFS_HASH: &str =
"1d0dad2a5a983ae4be9a401b0aac325d2a38f1ba217efe0c43bc68806d2ba54a";
const CHIP_ID: [u8; 64] = [42u8; 64];
const MEASUREMENT: [u8; 48] = [66u8; 48];
const CHIP_ID: [u8; 64] = [42_u8; 64];
const MEASUREMENT: [u8; 48] = [66_u8; 48];

const A_ROOT_PATH: &str = "/dev/disk/by-partuuid/7c0a626e-e5ea-e543-b5c5-300eb8304db7";
const B_ROOT_PATH: &str = "/dev/disk/by-partuuid/a78bc3a8-376c-054a-96e7-3904b915d0c5";
Expand Down Expand Up @@ -201,7 +201,7 @@ impl TestFixture {
Label::from("time") => LabeledTree::Leaf(vec![0u8; 8])
]);

let mut rng = rand::rngs::StdRng::from_seed([42u8; 32]);
let mut rng = rand::rngs::StdRng::from_seed([42_u8; 32]);
let (_cert, root_pk, cert_cbor) =
CertificateBuilder::new_with_rng(CertificateData::CustomTree(tree), &mut rng).build();

Expand Down
4 changes: 2 additions & 2 deletions rs/ic_os/remote_attestation/server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,14 @@ mod tests {
attestation_report
.verify_custom_data(&SevCustomData::new(
SevCustomDataNamespace::RawRemoteAttestation,
[0u8; 32],
[0_u8; 32],
))
.unwrap();
}

#[test]
async fn test_31_bytes_fails() {
let custom_data = [0u8; 31];
let custom_data = [0_u8; 31];
let request = AttestRequest {
custom_data: Some(custom_data.to_vec()),
};
Expand Down
4 changes: 2 additions & 2 deletions rs/ic_os/sev/attestation/src/custom_data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ impl SevCustomData {
/// Generates a random `SevCustomData` with the given `namespace`.
#[cfg(not(target_arch = "wasm32"))]
pub fn random(namespace: SevCustomDataNamespace, rng: &mut impl rand::Rng) -> Self {
let mut data = [0u8; 32];
let mut data = [0_u8; 32];
rng.fill(&mut data[..]);
Self { namespace, data }
}
Expand All @@ -62,7 +62,7 @@ impl SevCustomData {
/// Returns the raw bytes of the custom data which can be passed to the SEV firmware for use in
/// attestation report generation.
pub fn to_bytes(&self) -> [u8; 64] {
let mut result = [0u8; 64];
let mut result = [0_u8; 64];
result[0..4].copy_from_slice(&self.namespace.as_bytes());
result[32..].copy_from_slice(&self.data);
result
Expand Down
8 changes: 4 additions & 4 deletions rs/ic_os/sev/attestation/testing/src/attestation_package.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,17 +100,17 @@ mod tests {
let sev_attestation_package: SevAttestationPackage =
ParsedSevAttestationPackageBuilder::new()
.with_custom_data(&custom_data)
.with_measurement([21u8; 48])
.with_chip_id([33u8; 64])
.with_measurement([21_u8; 48])
.with_chip_id([33_u8; 64])
.build()
.into();

ParsedSevAttestationPackage::parse(
sev_attestation_package,
SevRootCertificateVerification::TestOnlySkipVerification,
)
.verify_measurement(&[[21u8; 48]])
.verify_chip_id(&[[33u8; 64]])
.verify_measurement(&[[21_u8; 48]])
.verify_chip_id(&[[33_u8; 64]])
.verify_custom_data(&custom_data)
.expect("Attestation package is invalid");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ fn create_certificate(

let cert = CertificateBuilder::new(
profile,
SerialNumber::from(1u32),
SerialNumber::from(1_u32),
Validity::from_now(Duration::from_secs(86400 * 365))?,
Name::from_str(&format!("CN={subject}"))?,
SubjectPublicKeyInfo::from_key(public_key)?,
Expand Down
2 changes: 1 addition & 1 deletion rs/ic_os/sev/guest/src/attestation_package.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ mod tests {
};

let mut firmware = MockSevGuestFirmwareBuilder::new()
.with_custom_data_override(Some([99u8; 64]))
.with_custom_data_override(Some([99_u8; 64]))
.with_signer(Some(signer))
// We make the mock firmware claim that it generates valid custom data, but it doesn't
// so the attestation package verification will fail.
Expand Down
4 changes: 2 additions & 2 deletions rs/ic_os/sev/guest/testing/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ impl Default for MockSevGuestFirmwareBuilder {
Self {
derived_key: None,
custom_data_override: None,
measurement: [0u8; 48],
chip_id: [0u8; 64],
measurement: [0_u8; 48],
chip_id: [0_u8; 64],
signer: None,
generates_report_with_wrong_custom_data: None,
generates_report_with_wrong_signature: None,
Expand Down
4 changes: 2 additions & 2 deletions rs/ic_os/vsock/vsock_lib/src/host/hsm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ pub mod tests {
use super::*;

let hsm_info = HSMInfo {
hsm_bus_num: 11u8,
hsm_address: 12u8,
hsm_bus_num: 11_u8,
hsm_address: 12_u8,
};
let actual = get_hsm_xml_string(&hsm_info);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ pub fn mainnet_query_calls_ic_gateway_test(env: TestEnv, bn_ipv6: Ipv6Addr) {
let mut rng = StdRng::from_entropy();
let prob = rng.r#gen::<f64>() * 100.0;

let mut payload = [0u8; 8];
let mut payload = [0_u8; 8];
rng.fill_bytes(&mut payload);
let canister_request = GenericRequest::new(
counter_canister_principal,
Expand Down
Loading