From 71664457de4575b40a7bea98823a2dc8ab7316cc Mon Sep 17 00:00:00 2001 From: Ignotus Peverell Date: Fri, 7 Dec 2018 22:43:37 +0000 Subject: [PATCH 1/2] Clean servers crate dev dependency on config --- Cargo.lock | 3 --- servers/Cargo.toml | 1 - servers/tests/api.rs | 1 - servers/tests/dandelion.rs | 1 - servers/tests/wallet.rs | 1 - 5 files changed, 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c13bdd0a..3af765eaa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -751,7 +751,6 @@ dependencies = [ "grin_keychain 0.4.2", "grin_store 0.4.2", "grin_util 0.4.2", - "grin_wallet 0.4.2", "lmdb-zero 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -854,7 +853,6 @@ dependencies = [ "grin_keychain 0.4.2", "grin_store 0.4.2", "grin_util 0.4.2", - "grin_wallet 0.4.2", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", @@ -885,7 +883,6 @@ dependencies = [ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "grin_api 0.4.2", "grin_chain 0.4.2", - "grin_config 0.4.2", "grin_core 0.4.2", "grin_keychain 0.4.2", "grin_p2p 0.4.2", diff --git a/servers/Cargo.toml b/servers/Cargo.toml index 74fc79c17..24ab2ff3c 100644 --- a/servers/Cargo.toml +++ b/servers/Cargo.toml @@ -36,4 +36,3 @@ grin_wallet = { path = "../wallet", version = "0.4.2" } [dev-dependencies] blake2-rfc = "0.2" -grin_config = { path = "../config", version = "0.4.2" } diff --git a/servers/tests/api.rs b/servers/tests/api.rs index 538f50c8f..7482fbbc8 100644 --- a/servers/tests/api.rs +++ b/servers/tests/api.rs @@ -17,7 +17,6 @@ extern crate log; extern crate grin_api as api; extern crate grin_chain as chain; -extern crate grin_config as config; extern crate grin_core as core; extern crate grin_p2p as p2p; extern crate grin_servers as servers; diff --git a/servers/tests/dandelion.rs b/servers/tests/dandelion.rs index d7f6a52ee..99d7d38ea 100644 --- a/servers/tests/dandelion.rs +++ b/servers/tests/dandelion.rs @@ -17,7 +17,6 @@ extern crate log; extern crate grin_api as api; extern crate grin_chain as chain; -extern crate grin_config as config; extern crate grin_core as core; extern crate grin_p2p as p2p; extern crate grin_servers as servers; diff --git a/servers/tests/wallet.rs b/servers/tests/wallet.rs index 62d531f73..08c609aa6 100644 --- a/servers/tests/wallet.rs +++ b/servers/tests/wallet.rs @@ -17,7 +17,6 @@ extern crate log; extern crate grin_api as api; extern crate grin_chain as chain; -extern crate grin_config as config; extern crate grin_core as core; extern crate grin_p2p as p2p; extern crate grin_servers as servers; From d17955900534cca5b248cfa25519d7bb28b91232 Mon Sep 17 00:00:00 2001 From: Ignotus Peverell Date: Mon, 10 Dec 2018 18:32:56 +0000 Subject: [PATCH 2/2] One more use fell through the cracks in merge --- servers/tests/api.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/servers/tests/api.rs b/servers/tests/api.rs index d8944e6b5..de856e82d 100644 --- a/servers/tests/api.rs +++ b/servers/tests/api.rs @@ -22,7 +22,6 @@ use self::util::init_test_logger; use self::util::Mutex; use crate::framework::{LocalServerContainer, LocalServerContainerConfig}; use grin_api as api; -use grin_config as config; use grin_core as core; use grin_p2p as p2p; use grin_util as util;