Rename masses back to mass (but no unit, since it's in the struct)

Author: ChristopherRabotin

anise/src/structure/dataset/mod.rs

@@ -558,7 +558,7 @@ mod dataset_ut {
                 i_xz_kgm2: -15.0,
                 i_yz_kgm2: 30.0,
             }),
-            masses: Some(Mass::from_dry_and_prop_masses(150.0, 50.6)),
+            mass: Some(Mass::from_dry_and_prop_masses(150.0, 50.6)),
             drag_data: Some(DragData::default()),
         };
         let srp_sc = SpacecraftData {
@@ -701,7 +701,7 @@ mod dataset_ut {
                 i_xz_kgm2: -15.0,
                 i_yz_kgm2: 30.0,
             }),
-            masses: Some(Mass::from_dry_and_prop_masses(150.0, 50.6)),
+            mass: Some(Mass::from_dry_and_prop_masses(150.0, 50.6)),
             drag_data: Some(DragData::default()),
         };
         let srp_sc = SpacecraftData {
@@ -756,10 +756,10 @@ mod dataset_ut {
 
         // Check that we can set by ID
         let mut repr = dataset.get_by_id(-50).unwrap();
-        repr.masses.as_mut().unwrap().dry_mass_kg = 100.5;
+        repr.mass.as_mut().unwrap().dry_mass_kg = 100.5;
         dataset.set_by_id(-50, repr).unwrap();
         assert_eq!(
-            dataset.get_by_id(-50).unwrap().masses.unwrap().dry_mass_kg,
+            dataset.get_by_id(-50).unwrap().mass.unwrap().dry_mass_kg,
             100.5,
             "value was not modified"
         );
@@ -772,7 +772,7 @@ mod dataset_ut {
         assert!(dataset.get_by_id(-50).is_err());
         // Check that we can fetch that data as we modified it.
         assert_eq!(
-            dataset.get_by_id(-52).unwrap().masses.unwrap().dry_mass_kg,
+            dataset.get_by_id(-52).unwrap().mass.unwrap().dry_mass_kg,
             100.5,
             "value not reachable after reid"
         );

anise/src/structure/spacecraft/mod.rs

@@ -25,7 +25,7 @@ pub use srp::SRPData;
 #[derive(Copy, Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct SpacecraftData {
     /// Mass of the spacecraft in kg
-    pub masses: Option<Mass>,
+    pub mass: Option<Mass>,
     /// Solar radiation pressure data
     pub srp_data: Option<SRPData>,
     /// Atmospheric drag data
@@ -49,7 +49,7 @@ impl SpacecraftData {
     fn available_data(&self) -> u8 {
         let mut bits: u8 = 0;
 
-        if self.masses.is_some() {
+        if self.mass.is_some() {
             bits |= 1 << 0;
         }
         if self.srp_data.is_some() {
@@ -70,15 +70,15 @@ impl Encode for SpacecraftData {
     fn encoded_len(&self) -> der::Result<der::Length> {
         let available_flags = self.available_data();
         available_flags.encoded_len()?
-            + self.masses.encoded_len()?
+            + self.mass.encoded_len()?
             + self.srp_data.encoded_len()?
             + self.drag_data.encoded_len()?
             + self.inertia.encoded_len()?
     }
 
     fn encode(&self, encoder: &mut impl Writer) -> der::Result<()> {
         self.available_data().encode(encoder)?;
-        self.masses.encode(encoder)?;
+        self.mass.encode(encoder)?;
         self.srp_data.encode(encoder)?;
         self.drag_data.encode(encoder)?;
         self.inertia.encode(encoder)
@@ -114,7 +114,7 @@ impl<'a> Decode<'a> for SpacecraftData {
         };
 
         Ok(Self {
-            masses: mass_kg,
+            mass: mass_kg,
             srp_data,
             drag_data,
             inertia,
@@ -171,7 +171,7 @@ mod spacecraft_constants_ut {
     #[test]
     fn sc_with_mass_only() {
         let repr = SpacecraftData {
-            masses: Some(Mass::default()),
+            mass: Some(Mass::default()),
             ..Default::default()
         };
 
@@ -214,7 +214,7 @@ mod spacecraft_constants_ut {
                 i_xz_kgm2: -15.0,
                 i_yz_kgm2: 30.0,
             }),
-            masses: Some(Mass::from_dry_and_prop_masses(150.0, 50.6)),
+            mass: Some(Mass::from_dry_and_prop_masses(150.0, 50.6)),
             ..Default::default()
         };
 
@@ -242,7 +242,7 @@ mod spacecraft_constants_ut {
                 i_xz_kgm2: -15.0,
                 i_yz_kgm2: 30.0,
             }),
-            masses: Some(Mass::from_dry_and_prop_masses(150.0, 50.6)),
+            mass: Some(Mass::from_dry_and_prop_masses(150.0, 50.6)),
             drag_data: Some(DragData::default()),
         };