Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 884b800d authored by Marybeth Fair's avatar Marybeth Fair Committed by Gerrit Code Review
Browse files

Merge "Add fingerprint to package map." into main

parents b939affd 688cae01

tools/aconfig/aconfig/src/storage/flag_info.rs

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ mod tests { 
        let flag_info_list = create_test_flag_info_list_from_source();

        assert!(flag_info_list.is_ok());

        let expected_flag_info_list =

            aconfig_storage_file::test_utils::create_test_flag_info_list();

            aconfig_storage_file::test_utils::create_test_flag_info_list(DEFAULT_FILE_VERSION);

        assert_eq!(flag_info_list.unwrap(), expected_flag_info_list);

    }

}

tools/aconfig/aconfig/src/storage/flag_table.rs

+2 −1
Original line number Diff line number Diff line
@@ -157,7 +157,8 @@ mod tests { 
    fn test_table_contents() {

        let flag_table = create_test_flag_table_from_source();

        assert!(flag_table.is_ok());

        let expected_flag_table = aconfig_storage_file::test_utils::create_test_flag_table();

        let expected_flag_table =

            aconfig_storage_file::test_utils::create_test_flag_table(DEFAULT_FILE_VERSION);

        assert_eq!(flag_table.unwrap(), expected_flag_table);

    }

}

tools/aconfig/aconfig/src/storage/flag_value.rs

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ mod tests { 
        let flag_value_list = create_test_flag_value_list_from_source();

        assert!(flag_value_list.is_ok());

        let expected_flag_value_list =

            aconfig_storage_file::test_utils::create_test_flag_value_list();

            aconfig_storage_file::test_utils::create_test_flag_value_list(DEFAULT_FILE_VERSION);

        assert_eq!(flag_value_list.unwrap(), expected_flag_value_list);

    }

}

tools/aconfig/aconfig/src/storage/mod.rs

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ use aconfig_storage_file::StorageFileType; 
pub struct FlagPackage<'a> {

    pub package_name: &'a str,

    pub package_id: u32,

    pub fingerprint: u64,

    pub flag_names: HashSet<&'a str>,

    pub boolean_flags: Vec<&'a ProtoParsedFlag>,

    // The index of the first boolean flag in this aconfig package among all boolean
@@ -44,6 +45,7 @@ impl<'a> FlagPackage<'a> { 
        FlagPackage {

            package_name,

            package_id,

            fingerprint: 0,

            flag_names: HashSet::new(),

            boolean_flags: vec![],

            boolean_start_index: 0,
@@ -79,6 +81,8 @@ where 
    for p in packages.iter_mut() {

        p.boolean_start_index = boolean_start_index;

        boolean_start_index += p.boolean_flags.len() as u32;



        // TODO: b/316357686 - Calculate fingerprint and add to package.

    }



    packages

tools/aconfig/aconfig/src/storage/package_table.rs

+3 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ impl PackageTableNodeWrapper { 
        let node = PackageTableNode {

            package_name: String::from(package.package_name),

            package_id: package.package_id,

            fingerprint: package.fingerprint,

            boolean_start_index: package.boolean_start_index,

            next_offset: None,

        };
@@ -127,7 +128,8 @@ mod tests { 
    fn test_table_contents() {

        let package_table = create_test_package_table_from_source();

        assert!(package_table.is_ok());

        let expected_package_table = aconfig_storage_file::test_utils::create_test_package_table();

        let expected_package_table =

            aconfig_storage_file::test_utils::create_test_package_table(DEFAULT_FILE_VERSION);

        assert_eq!(package_table.unwrap(), expected_package_table);

    }

}