From 721a22b1c4e13a1ca057907b443ce37132688308 Mon Sep 17 00:00:00 2001 From: Yeastplume Date: Fri, 6 Jul 2018 11:42:54 +0100 Subject: [PATCH] Simulnet test fix (#1222) * remove lower time bound * simulnet test issue * re-introduce lower bound * re-introduce lower bound --- core/tests/consensus.rs | 3 +-- servers/tests/framework/mod.rs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/tests/consensus.rs b/core/tests/consensus.rs index 5e78bbf6d..26b757755 100644 --- a/core/tests/consensus.rs +++ b/core/tests/consensus.rs @@ -17,7 +17,7 @@ extern crate grin_core as core; extern crate time; use core::consensus::{next_difficulty, valid_header_version, TargetError, - DIFFICULTY_ADJUST_WINDOW, MEDIAN_TIME_WINDOW, LOWER_TIME_BOUND, + DIFFICULTY_ADJUST_WINDOW, MEDIAN_TIME_WINDOW, UPPER_TIME_BOUND, BLOCK_TIME_WINDOW, DAMP_FACTOR, MEDIAN_TIME_INDEX}; use core::core::target::Difficulty; use std::fmt::{self, Display}; @@ -268,7 +268,6 @@ fn print_chain_sim( println!("DIFFICULTY_ADJUST_WINDOW: {}", DIFFICULTY_ADJUST_WINDOW); println!("BLOCK_TIME_WINDOW: {}", BLOCK_TIME_WINDOW); println!("MEDIAN_TIME_WINDOW: {}", MEDIAN_TIME_WINDOW); - println!("LOWER_TIME_BOUND: {}", LOWER_TIME_BOUND); println!("UPPER_TIME_BOUND: {}", UPPER_TIME_BOUND); println!("DAMP_FACTOR: {}", DAMP_FACTOR); chain_sim.iter().enumerate().for_each(|(i, b)| { diff --git a/servers/tests/framework/mod.rs b/servers/tests/framework/mod.rs index 672008fa4..61274ed1f 100644 --- a/servers/tests/framework/mod.rs +++ b/servers/tests/framework/mod.rs @@ -220,7 +220,7 @@ impl LocalServerContainer { "starting test Miner on port {}", self.config.p2p_server_port ); - s.start_test_miner(Some(self.config.coinbase_wallet_address.clone())); + s.start_test_miner(wallet_url); } for p in &mut self.peer_list {