Remove RepoBuilder::commit_skip_validation

Author: erickt

tuf/src/client.rs

@@ -1434,16 +1434,14 @@ mod test {
         // Store an expired root in the local store.
         let mut local = EphemeralRepository::<Json>::new();
         let metadata1 = RepoBuilder::create(&mut local)
+            .current_time(Utc.timestamp(0, 0))
             .trusted_root_keys(&[&KEYS[0]])
             .trusted_targets_keys(&[&KEYS[0]])
             .trusted_snapshot_keys(&[&KEYS[0]])
             .trusted_timestamp_keys(&[&KEYS[0]])
-            .stage_root_with_builder(|bld| {
-                bld.consistent_snapshot(true)
-                    .expires(Utc.ymd(1970, 1, 1).and_hms(0, 0, 0))
-            })
+            .stage_root_with_builder(|bld| bld.consistent_snapshot(true))
             .unwrap()
-            .commit_skip_validation()
+            .commit()
             .await
             .unwrap();
 
@@ -1709,38 +1707,32 @@ mod test {
 
             // Store an expired root in the local store.
             let metadata1 = RepoBuilder::create(&mut local)
+                .current_time(Utc.timestamp(0, 0))
                 .trusted_root_keys(&[&KEYS[0]])
                 .trusted_targets_keys(&[&KEYS[0]])
                 .trusted_snapshot_keys(&[&KEYS[0]])
                 .trusted_timestamp_keys(&[&KEYS[0]])
-                .stage_root_with_builder(|bld| {
-                    bld.version(1)
-                        .consistent_snapshot(true)
-                        .expires(Utc.ymd(1970, 1, 1).and_hms(0, 0, 0))
-                })
+                .stage_root_with_builder(|bld| bld.version(1).consistent_snapshot(true))
                 .unwrap()
-                .commit_skip_validation()
+                .commit()
                 .await
                 .unwrap();
 
             let metadata2 = RepoBuilder::create(&mut local)
+                .current_time(Utc.timestamp(0, 0))
                 .trusted_root_keys(&[&KEYS[0]])
                 .trusted_targets_keys(&[&KEYS[0]])
                 .trusted_snapshot_keys(&[&KEYS[0]])
                 .trusted_timestamp_keys(&[&KEYS[0]])
-                .stage_root_with_builder(|bld| {
-                    bld.version(2)
-                        .consistent_snapshot(true)
-                        .expires(Utc.ymd(1970, 1, 1).and_hms(0, 0, 0))
-                })
+                .stage_root_with_builder(|bld| bld.version(2).consistent_snapshot(true))
                 .unwrap()
                 .stage_targets_with_builder(|bld| bld.version(2))
                 .unwrap()
                 .stage_snapshot_with_builder(|bld| bld.version(2))
                 .unwrap()
                 .stage_timestamp_with_builder(|bld| bld.version(2))
                 .unwrap()
-                .commit_skip_validation()
+                .commit()
                 .await
                 .unwrap();
 

tuf/src/repo_builder.rs

@@ -917,17 +917,6 @@ where
         self.stage_targets_if_necessary()?.commit().await
     }
 
-    /// Commit the metadata for this repository without validating it.
-    ///
-    /// Warning: This can write invalid metadata to a repository without
-    /// validating that it is correct.
-    #[cfg(test)]
-    pub async fn commit_skip_validation(self) -> Result<RawSignedMetadataSet<D>> {
-        self.stage_targets_if_necessary()?
-            .commit_skip_validation()
-            .await
-    }
-
     fn need_new_targets(&self) -> bool {
         // We need a new targets metadata if we added any targets.
         if !self.state.targets.is_empty() {
@@ -1086,17 +1075,6 @@ where
         self.stage_snapshot_if_necessary()?.commit().await
     }
 
-    /// Commit the metadata for this repository without validating it.
-    ///
-    /// Warning: This can write invalid metadata to a repository without
-    /// validating that it is correct.
-    #[cfg(test)]
-    pub async fn commit_skip_validation(self) -> Result<RawSignedMetadataSet<D>> {
-        self.stage_snapshot_if_necessary()?
-            .commit_skip_validation()
-            .await
-    }
-
     fn need_new_snapshot(&self) -> bool {
         // We need a new snapshot metadata if we staged a new root.
         if self.state.staged_root.is_some() {
@@ -1255,17 +1233,6 @@ where
         self.stage_timestamp_if_necessary()?.commit().await
     }
 
-    /// Commit the metadata for this repository without validating it.
-    ///
-    /// Warning: This can write invalid metadata to a repository without
-    /// validating that it is correct.
-    #[cfg(test)]
-    pub async fn commit_skip_validation(self) -> Result<RawSignedMetadataSet<D>> {
-        self.stage_timestamp_if_necessary()?
-            .commit_skip_validation()
-            .await
-    }
-
     fn need_new_timestamp(&self) -> bool {
         // We need a new timestamp metadata if we staged a new root.
         if self.state.staged_root.is_some() {
@@ -1312,23 +1279,7 @@ where
     pub async fn commit(mut self) -> Result<RawSignedMetadataSet<D>> {
         self.validate_built_metadata()?;
         self.write_repo().await?;
-        Ok(self.build_skip_validation())
-    }
 
-    /// Commit the metadata for this repository without validating it.
-    ///
-    /// Warning: This can write invalid metadata to a repository without validating that it is
-    /// correct.
-    #[cfg(test)]
-    pub async fn commit_skip_validation(mut self) -> Result<RawSignedMetadataSet<D>> {
-        self.write_repo().await?;
-        Ok(self.build_skip_validation())
-    }
-
-    /// Build the metadata without validating it for correctness.
-    ///
-    /// Warning: This can produce invalid metadata.
-    fn build_skip_validation(self) -> RawSignedMetadataSet<D> {
         let mut builder = RawSignedMetadataSetBuilder::new();
 
         if let Some(root) = self.state.staged_root {
@@ -1347,7 +1298,7 @@ where
             builder = builder.timestamp(timestamp.raw);
         }
 
-        builder.build()
+        Ok(builder.build())
     }
 
     /// Before we commit any metadata, make sure that we can update from our