diff --git a/Cargo.lock b/Cargo.lock index 22f04126d..63abda7a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -254,11 +254,9 @@ dependencies = [ name = "blooms-db" version = "0.1.0" dependencies = [ - "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "ethbloom 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/util/blooms-db/Cargo.toml b/util/blooms-db/Cargo.toml index f4a2bb5d3..5b54f8c10 100644 --- a/util/blooms-db/Cargo.toml +++ b/util/blooms-db/Cargo.toml @@ -3,12 +3,11 @@ name = "blooms-db" version = "0.1.0" license = "GPL-3.0" authors = ["Parity Technologies "] +edition = "2018" [dependencies] -byteorder = "1.2" ethbloom = "0.6.4" parking_lot = "0.7" -tiny-keccak = "1.4" [dev-dependencies] tempdir = "0.3" diff --git a/util/blooms-db/src/db.rs b/util/blooms-db/src/db.rs index 7a423d81d..f3cf837cd 100644 --- a/util/blooms-db/src/db.rs +++ b/util/blooms-db/src/db.rs @@ -16,10 +16,8 @@ use std::{error, io, fmt}; use std::path::{Path, PathBuf}; - use ethbloom; - -use file::{File, FileIterator}; +use crate::file::{File, FileIterator}; fn other_io_err(e: E) -> io::Error where E: Into> { io::Error::new(io::ErrorKind::Other, e) diff --git a/util/blooms-db/src/file.rs b/util/blooms-db/src/file.rs index 656447243..d5c2e579b 100644 --- a/util/blooms-db/src/file.rs +++ b/util/blooms-db/src/file.rs @@ -17,7 +17,6 @@ use std::io::{Seek, SeekFrom, Write, Read}; use std::path::Path; use std::{io, fs}; - use ethbloom; /// Autoresizable file containing blooms. diff --git a/util/blooms-db/src/lib.rs b/util/blooms-db/src/lib.rs index 83baaffae..a13d8a5fe 100644 --- a/util/blooms-db/src/lib.rs +++ b/util/blooms-db/src/lib.rs @@ -16,19 +16,12 @@ //! Ethereum blooms database -extern crate byteorder; -extern crate ethbloom; -extern crate parking_lot; -extern crate tiny_keccak; - -#[cfg(test)] -extern crate tempdir; - mod db; mod file; use std::io; use std::path::Path; +use ethbloom; use parking_lot::Mutex; /// Threadsafe API for blooms database.