Cleanup

oxidecomputer · Jun 24, 2024 · b1339d4 · b1339d4
1 parent acaf91f
commit b1339d4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/dev-tools/reconfigurator-cli/tests/test_basic.rs b/dev-tools/reconfigurator-cli/tests/test_basic.rs
@@ -175,7 +175,7 @@ async fn test_blueprint_edit(cptestctx: &ControlPlaneTestContext) {
     // Load the new file and find the new blueprint name.
     let state2: UnstableReconfiguratorState =
         read_json(&saved_state2_path).unwrap();
-    assert_eq!(state2.blueprints.len(), state1.blueprints.len() + 1); // XXX
+    assert_eq!(state2.blueprints.len(), state1.blueprints.len() + 1);
     let new_blueprint = state2.blueprints.into_iter().rev().next().unwrap();
     assert_ne!(new_blueprint.id, blueprint.id);
 

diff --git a/nexus/db-queries/src/db/datastore/deployment.rs b/nexus/db-queries/src/db/datastore/deployment.rs
@@ -504,7 +504,7 @@ impl DataStore {
                 )
                 .filter(dsl::blueprint_id.eq(blueprint_id))
                 .select(BpOmicronZone::as_select())
-                .load_async::<BpOmicronZone>(&*conn)
+                .load_async(&*conn)
                 .await
                 .map_err(|e| {
                     public_error_from_diesel(e, ErrorHandler::Server)

diff --git a/nexus/reconfigurator/execution/src/dns.rs b/nexus/reconfigurator/execution/src/dns.rs
@@ -1242,8 +1242,6 @@ mod test {
                 .await
                 .unwrap()
         };
-        info!(log, "Sled rows"; "rows" => ?sled_rows);
-        info!(log, "Zpool rows"; "rows" => ?zpool_rows);
         let planning_input = {
             let mut builder = PlanningInputFromDb {
                 sled_rows: &sled_rows,