Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-04-23 02:41:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Upgrade and uniformize dependencies ()

Browse source 
* Remove unused DandelionConfig

* Cargo upgrade and cleanup
This commit is contained in:
Quentin Le Sceller 2018-06-05 13:26:32 -04:00 • committed by GitHub
parent 057eb2dcb8
commit 1255ea2224
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 289 additions and 295 deletions

500
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

10
Cargo.toml
View file

@ -16,12 +16,12 @@ path = "src/bin/grin.rs"
[dependencies]
blake2-rfc = "0.2"
chrono = "0.4"
clap = "2.23"
daemonize = "0.2"
clap = "2.31"
daemonize = "0.3"
serde = "1"
serde_json = "1"
slog = { version = "~2.1", features = ["max_level_trace", "release_max_level_trace"] }
term = "0.4"
slog = { version = "~2.2", features = ["max_level_trace", "release_max_level_trace"] }
term = "0.5"
time = "0.1"
grin_api = { path = "./api" }
@ -43,4 +43,4 @@ tag = "grin_integration_1"
# secp256k1zkp = { git = "https://github.com/mimblewimble/rust-secp256k1-zkp" }
[build-dependencies]
built = "0.2"
built = "0.3"

6
api/Cargo.toml
View file

@ -10,14 +10,14 @@ failure = "0.1"
failure_derive = "0.1"
hyper = "0.10"
iron = "0.5"
lazy_static = "0.2"
lazy_static = "1"
mount = "0.3"
regex = "0.2"
regex = "1"
router = "0.5"
serde = "1"
serde_derive = "1"
serde_json = "1"
slog = { version = "~2.1", features = ["max_level_trace", "release_max_level_trace"] }
slog = { version = "~2.2", features = ["max_level_trace", "release_max_level_trace"] }
urlencoded = "0.5" # 0.6+ lacks trait `plugin::Plugin<iron::Request<'_, '_>>`
grin_core = { path = "../core" }

4
chain/Cargo.toml
View file

@ -7,8 +7,8 @@ publish = false
[dependencies]
bitflags = "1"
byteorder = "0.5"
slog = { version = "~2.1", features = ["max_level_trace", "release_max_level_trace"] }
byteorder = "1"
slog = { version = "~2.2", features = ["max_level_trace", "release_max_level_trace"] }
serde = "1"
serde_derive = "1"
time = "0.1"

8
core/Cargo.toml
View file

@ -9,13 +9,13 @@ publish = false
bitflags = "1"
blake2-rfc = "0.2"
byteorder = "1"
lazy_static = "0.2"
num-bigint = "0.1"
lazy_static = "1"
num-bigint = "0.2"
rand = "0.3"
serde = "1"
serde_derive = "1"
siphasher = "0.1"
slog = { version = "~2.1", features = ["max_level_trace", "release_max_level_trace"] }
siphasher = "0.2"
slog = { version = "~2.2", features = ["max_level_trace", "release_max_level_trace"] }
time = "0.1"
grin_keychain = { path = "../keychain" }

4
keychain/Cargo.toml
View file

@ -9,10 +9,10 @@ publish = false
byteorder = "1"
blake2-rfc = "0.2"
rand = "0.3"
slog = { version = "~2.1", features = ["max_level_trace", "release_max_level_trace"] }
slog = { version = "~2.2", features = ["max_level_trace", "release_max_level_trace"] }
serde = "1"
serde_derive = "1"
serde_json = "1"
uuid = { version = "0.5", features = ["serde", "v4"] }
uuid = { version = "0.6", features = ["serde", "v4"] }
grin_util = { path = "../util" }

2
p2p/Cargo.toml
View file

@ -14,7 +14,7 @@ num = "0.1"
rand = "0.3"
serde = "1"
serde_derive = "1"
slog = { version = "~2.1", features = ["max_level_trace", "release_max_level_trace"] }
slog = { version = "~2.2", features = ["max_level_trace", "release_max_level_trace"] }
time = "0.1"
grin_core = { path = "../core" }

10
p2p/tests/peer_handshake.rs
View file

@ -14,19 +14,17 @@
extern crate grin_core as core;
extern crate grin_p2p as p2p;
extern crate grin_pool as pool;
extern crate grin_util as util;
use std::net::{SocketAddr, TcpListener, TcpStream};
use std::sync::Arc;
use std::sync::atomic::AtomicBool;
use std::sync::Arc;
use std::thread;
use std::time;
use core::core::hash::Hash;
use core::core::target::Difficulty;
use p2p::Peer;
use pool::DandelionConfig;
fn open_port() -> u16 {
// use port 0 to allow the OS to assign an open port
@ -49,12 +47,6 @@ fn peer_handshake() {
peers_deny: None,
..p2p::P2PConfig::default()
};
let dandelion_config = pool::DandelionConfig {
relay_secs: Some(600),
embargo_secs: Some(30),
patience_secs: Some(10),
stem_probability: Some(90),
};
let net_adapter = Arc::new(p2p::DummyAdapter {});
let server = Arc::new(
p2p::Server::new(

2
pool/Cargo.toml
View file

@ -10,7 +10,7 @@ blake2-rfc = "0.2"
rand = "0.3"
serde = "1"
serde_derive = "1"
slog = { version = "~2.1", features = ["max_level_trace", "release_max_level_trace"] }
slog = { version = "~2.2", features = ["max_level_trace", "release_max_level_trace"] }
time = "0.1"
grin_core = { path = "../core" }

8
servers/Cargo.toml
View file

@ -7,16 +7,16 @@ publish = false
[dependencies]
hyper = "0.10"
itertools = "0.6"
itertools = "0.7"
rand = "0.3"
router = "0.5"
slog = { version = "~2.1", features = ["max_level_trace", "release_max_level_trace"] }
router = "0.6"
slog = { version = "~2.2", features = ["max_level_trace", "release_max_level_trace"] }
serde = "1"
serde_derive = "1"
serde_json = "1"
time = "0.1"
bufstream = "~0.1"
jsonrpc-core = "~4.0"
jsonrpc-core = "~8.0"
grin_api = { path = "../api" }
grin_chain = { path = "../chain" }

4
servers/tests/simulnet.rs
View file

@ -22,11 +22,9 @@ extern crate grin_wallet as wallet;
mod framework;
use std::fs;
use std::sync::Arc;
use std::default::Default;
use std::thread;
use std::time;
use std::default::Default;
use core::global;
use core::global::ChainTypes;

6
store/Cargo.toml
View file

@ -9,11 +9,11 @@ publish = false
byteorder = "1"
env_logger = "0.3"
libc = "0.2"
memmap = { git = "https://github.com/danburkert/memmap-rs", tag = "0.6.0" }
rocksdb = "0.8"
memmap = { git = "https://github.com/danburkert/memmap-rs", tag = "0.6.2" }
rocksdb = "0.10"
serde = "1"
serde_derive = "1"
slog = { version = "~2.1", features = ["max_level_trace", "release_max_level_trace"] }
slog = { version = "~2.2", features = ["max_level_trace", "release_max_level_trace"] }
grin_core = { path = "../core" }
grin_util = { path = "../util" }

10
util/Cargo.toml
View file

@ -8,15 +8,15 @@ publish = false
[dependencies]
backtrace = "0.3"
byteorder = "1"
lazy_static = "0.2"
lazy_static = "1"
rand = "0.3"
serde = "1"
serde_derive = "1"
slog = { version = "~2.1", features = ["max_level_trace", "release_max_level_trace"] }
slog-term = "2.1"
slog-async = "2.1"
slog = { version = "~2.2", features = ["max_level_trace", "release_max_level_trace"] }
slog-term = "2.4"
slog-async = "2.3"
walkdir = "2"
zip = "0.2"
zip = "0.4"
[dependencies.secp256k1zkp]
git = "https://github.com/mimblewimble/rust-secp256k1-zkp"

2
util/src/secp_static.rs
View file

@ -15,9 +15,9 @@
//! Globally accessible static instance of secp256k1, to avoid
//! initialisation overhead
use std::sync::{Arc, Mutex};
use rand::thread_rng;
use secp_ as secp;
use std::sync::{Arc, Mutex};
lazy_static! {
/// Static reference to secp instance

8
wallet/Cargo.toml
View file

@ -14,17 +14,17 @@ failure_derive = "0.1"
futures = "0.1"
hyper = "0.11"
iron = "0.5"
prettytable-rs = "0.6"
prettytable-rs = "0.7"
rand = "0.3"
router = "0.5"
serde = "1"
serde_derive = "1"
serde_json = "1"
slog = { version = "~2.1", features = ["max_level_trace", "release_max_level_trace"] }
term = "0.4"
slog = { version = "~2.2", features = ["max_level_trace", "release_max_level_trace"] }
term = "0.5"
tokio-core = "0.1"
tokio-retry = "0.1"
uuid = { version = "0.5", features = ["serde", "v4"] }
uuid = { version = "0.6", features = ["serde", "v4"] }
urlencoded = "0.5"
grin_api = { path = "../api" }