Updated blooms-db to rust 2018 and removed redundant deps (#10785)

openethereum · Jun 26, 2019 · 63221c5 · 63221c5
1 parent 8714a40
commit 63221c5
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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 <admin@parity.io>"]
+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
@@ -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: E) -> io::Error where E: Into<Box<error::Error + Send + Sync>> {
  io::Error::new(io::ErrorKind::Other, e)

diff --git 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
@@ -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.