grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marek Kotewicz 2019-06-26 18:24:32 +08:00 committed by GitHub
parent 8714a40d84
commit 63221c5152
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -254,11 +254,9 @@ dependencies = [
name = "blooms-db" name = "blooms-db"
version = "0.1.0" version = "0.1.0"
dependencies = [ 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)", "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)", "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)", "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]] [[package]]

3
util/blooms-db/Cargo.toml
View File

@ -3,12 +3,11 @@ name = "blooms-db"
version = "0.1.0" version = "0.1.0"
license = "GPL-3.0" license = "GPL-3.0"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies] [dependencies]
byteorder = "1.2"
ethbloom = "0.6.4" ethbloom = "0.6.4"
parking_lot = "0.7" parking_lot = "0.7"
tiny-keccak = "1.4"
[dev-dependencies] [dev-dependencies]
tempdir = "0.3" tempdir = "0.3"

4
util/blooms-db/src/db.rs
View File

@ -16,10 +16,8 @@
use std::{error, io, fmt}; use std::{error, io, fmt};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use ethbloom; use ethbloom;
use crate::file::{File, FileIterator};
use file::{File, FileIterator};
fn other_io_err<E>(e: E) -> io::Error where E: Into<Box<error::Error + Send + Sync>> { fn other_io_err<E>(e: E) -> io::Error where E: Into<Box<error::Error + Send + Sync>> {
io::Error::new(io::ErrorKind::Other, e) io::Error::new(io::ErrorKind::Other, e)

1
util/blooms-db/src/file.rs
View File

@ -17,7 +17,6 @@
use std::io::{Seek, SeekFrom, Write, Read}; use std::io::{Seek, SeekFrom, Write, Read};
use std::path::Path; use std::path::Path;
use std::{io, fs}; use std::{io, fs};
use ethbloom; use ethbloom;
/// Autoresizable file containing blooms. /// Autoresizable file containing blooms.

9
util/blooms-db/src/lib.rs
View File

@ -16,19 +16,12 @@
//! Ethereum blooms database //! 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 db;
mod file; mod file;
use std::io; use std::io;
use std::path::Path; use std::path::Path;
use ethbloom;
use parking_lot::Mutex; use parking_lot::Mutex;
/// Threadsafe API for blooms database. /// Threadsafe API for blooms database.