Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

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

Merged
merged 1 commit into from
Jun 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions util/blooms-db/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 1 addition & 3 deletions util/blooms-db/src/db.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion util/blooms-db/src/file.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
9 changes: 1 addition & 8 deletions util/blooms-db/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down