From 5c169ac81ad497f51006b6b3bf9f9fa66999f483 Mon Sep 17 00:00:00 2001 From: "Andrew J. Stone" Date: Fri, 29 Sep 2023 05:18:29 +0000 Subject: [PATCH] wip --- sled-storage/Cargo.toml | 1 - sled-storage/src/pool.rs | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/sled-storage/Cargo.toml b/sled-storage/Cargo.toml index ae9718382d..8c8ddeeb88 100644 --- a/sled-storage/Cargo.toml +++ b/sled-storage/Cargo.toml @@ -28,5 +28,4 @@ tokio.workspace = true uuid.workspace = true [dev-dependencies] -illumos-utils = { workspace = true, features = ["testing"] } omicron-test-utils.workspace = true diff --git a/sled-storage/src/pool.rs b/sled-storage/src/pool.rs index a16722537d..203738b16a 100644 --- a/sled-storage/src/pool.rs +++ b/sled-storage/src/pool.rs @@ -5,14 +5,9 @@ //! ZFS storage pool use crate::error::Error; -use illumos_utils::zpool::{ZpoolInfo, ZpoolName}; +use illumos_utils::zpool::{Zpool, ZpoolInfo, ZpoolName}; use omicron_common::disk::DiskIdentity; -#[cfg(test)] -use illumos_utils::zpool::MockZpool as Zpool; -#[cfg(not(test))] -use illumos_utils::zpool::Zpool; - /// A ZFS storage pool #[derive(Debug, Clone)] pub struct Pool {