fixup imports in tests and examples

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

Cargo.toml

@@ -87,6 +87,9 @@ xdg = "2.2"
 nom = "5.1"
 crossbeam-channel = "0.5"
 
+# Used only by examples currently:
+zstd = { version = "0.6", features = [ "bindgen" ] }
+
 pathpatterns = "0.1.2"
 pxar = { version = "0.10.1", features = [ "tokio-io" ] }
 

examples/test_chunk_size.rs

@@ -5,7 +5,7 @@ extern crate proxmox_backup;
 use anyhow::{Error};
 use std::io::{Read, Write};
 
-use proxmox_backup::backup::*;
+use pbs_datastore::Chunker;
 
 struct ChunkWriter {
     chunker: Chunker,

examples/test_chunk_speed.rs

@@ -1,7 +1,6 @@
 extern crate proxmox_backup;
 
-//use proxmox_backup::backup::chunker::*;
+use pbs_datastore::Chunker;
-use proxmox_backup::backup::*;
 
 fn main() {
 

pbs-datastore/src/lib.rs

@@ -214,6 +214,8 @@ pub use crypt_config::{CryptConfig, CryptMode, Fingerprint};
 pub use crypt_reader::CryptReader;
 pub use crypt_writer::CryptWriter;
 pub use data_blob::DataBlob;
+pub use data_blob_reader::DataBlobReader;
+pub use data_blob_writer::DataBlobWriter;
 pub use key_derivation::{
     decrypt_key, load_and_decrypt_key, rsa_decrypt_key_config, rsa_encrypt_key_config,
 };

src/tape/test/alloc_writable_media.rs

@@ -5,8 +5,9 @@
 use std::path::PathBuf;
 use anyhow::Error;
 
+use pbs_systemd::time::parse_time_span;
+
 use crate::{
-    tools::systemd::time::parse_time_span,
     api2::types::{
         MediaSetPolicy,
         RetentionPolicy,

src/tape/test/compute_media_state.rs

@@ -107,8 +107,8 @@ fn test_media_expire_time() -> Result<(), Error> {
     let sl2= MediaSetLabel::with_data("p1", Uuid::generate(), 0, ctime + 120, None);
     let tape2_uuid = inventory.generate_used_tape("tape2", sl2, 0);
 
-    let event = crate::tools::systemd::time::parse_calendar_event("*:0/2")?;
+    let event = pbs_systemd::time::parse_calendar_event("*:0/2")?;
-    let span = crate::tools::systemd::time::parse_time_span("120 seconds")?;
+    let span = pbs_systemd::time::parse_time_span("120 seconds")?;
 
     let pool = MediaPool::new(
         "p1",

tests/blob_writer.rs

@@ -4,7 +4,7 @@ use std::io::Cursor;
 use std::io::{Read, Write, Seek, SeekFrom };
 use lazy_static::lazy_static;
 
-use proxmox_backup::backup::*;
+use pbs_datastore::{CryptConfig, DataBlob, DataBlobReader, DataBlobWriter};
 
 lazy_static! {
     static ref TEST_DATA: Vec<u8> = {

tests/prune.rs

@@ -1,7 +1,9 @@
 use anyhow::{Error};
 use std::path::PathBuf;
 
-use proxmox_backup::backup::*;
+use pbs_datastore::manifest::MANIFEST_BLOB_NAME;
+use pbs_datastore::prune::{compute_prune_info, PruneOptions};
+use pbs_datastore::{BackupDir, BackupInfo};
 
 fn get_prune_list(
     list: Vec<BackupInfo>,