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

Merge branch 'master' of github.com:ethcore/parity into sync

Browse Source
This commit is contained in:
arkpar
2016-01-29 17:14:06 +01:00
parent 61f39d68f8 5210f9e56d
commit e3b24282f2
26 changed files with 610 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sync/tests.rs
View File

@@ -325,7 +325,6 @@ impl TestNet {
#[test]
fn chain_two_peers() {
::env_logger::init().ok();
let mut net = TestNet::new(3);
net.peer_mut(1).chain.add_blocks(1000, false);
net.peer_mut(2).chain.add_blocks(1000, false);
@@ -336,7 +335,6 @@ fn chain_two_peers() {
#[test]
fn chain_status_after_sync() {
::env_logger::init().ok();
let mut net = TestNet::new(3);
net.peer_mut(1).chain.add_blocks(1000, false);
net.peer_mut(2).chain.add_blocks(1000, false);
@@ -356,7 +354,6 @@ fn chain_takes_few_steps() {
#[test]
fn chain_empty_blocks() {
::env_logger::init().ok();
let mut net = TestNet::new(3);
for n in 0..200 {
net.peer_mut(1).chain.add_blocks(5, n % 2 == 0);
@@ -368,8 +365,7 @@ fn chain_empty_blocks() {
}
#[test]
fn chain_forged() {
::env_logger::init().ok();
fn chain_forked() {
let mut net = TestNet::new(3);
net.peer_mut(0).chain.add_blocks(300, false);
net.peer_mut(1).chain.add_blocks(300, false);