@@ -14,7 +14,7 @@ use nexus_test_utils::http_testing::{NexusRequest, RequestBuilder};
1414use nexus_test_utils:: resource_helpers:: object_get;
1515use nexus_test_utils:: test_setup;
1616use nexus_types:: external_api:: params:: SetTargetReleaseParams ;
17- use nexus_types:: external_api:: views:: { TufRepoUpload , UpdateStatus } ;
17+ use nexus_types:: external_api:: views;
1818use semver:: Version ;
1919use tufaceous_artifact:: { ArtifactVersion , KnownArtifactKind } ;
2020use tufaceous_lib:: assemble:: ManifestTweak ;
@@ -29,7 +29,7 @@ async fn get_set_target_release() -> Result<()> {
2929 let logctx = & ctx. logctx ;
3030
3131 // There is no target release before one has ever been specified
32- let status: UpdateStatus =
32+ let status: views :: UpdateStatus =
3333 object_get ( client, "/v1/system/update/status" ) . await ;
3434 assert_eq ! ( status. target_release. 0 , None ) ;
3535
@@ -53,7 +53,7 @@ async fn get_set_target_release() -> Result<()> {
5353 {
5454 let before = Utc :: now ( ) ;
5555 let system_version = Version :: new ( 1 , 0 , 0 ) ;
56- let response: TufRepoUpload = trust_root
56+ let response: views :: TufRepoUpload = trust_root
5757 . assemble_repo ( & logctx. log , & [ ] )
5858 . await ?
5959 . into_upload_request ( client, StatusCode :: OK )
@@ -64,7 +64,7 @@ async fn get_set_target_release() -> Result<()> {
6464
6565 set_target_release ( client, & system_version) . await ?;
6666
67- let status: UpdateStatus =
67+ let status: views :: UpdateStatus =
6868 object_get ( client, "/v1/system/update/status" ) . await ;
6969
7070 let target_release = status. target_release . 0 . unwrap ( ) ;
@@ -85,7 +85,7 @@ async fn get_set_target_release() -> Result<()> {
8585 version : ArtifactVersion :: new ( "non-semver-2" ) . unwrap ( ) ,
8686 } ,
8787 ] ;
88- let response: TufRepoUpload = trust_root
88+ let response: views :: TufRepoUpload = trust_root
8989 . assemble_repo ( & logctx. log , tweaks)
9090 . await ?
9191 . into_upload_request ( client, StatusCode :: OK )
@@ -96,7 +96,7 @@ async fn get_set_target_release() -> Result<()> {
9696
9797 set_target_release ( client, & system_version) . await ?;
9898
99- let status: UpdateStatus =
99+ let status: views :: UpdateStatus =
100100 object_get ( client, "/v1/system/update/status" ) . await ;
101101
102102 let target_release = status. target_release . 0 . unwrap ( ) ;
0 commit comments