Merge branch 'master' into auth-round

This commit is contained in:
keorn
2016-11-14 18:04:44 +00:00
26 changed files with 266 additions and 206 deletions

View File

@@ -1259,7 +1259,7 @@ mod tests {
#[test]
fn internal_seals_without_work() {
let miner = Miner::with_spec(&Spec::new_test_instant());
let miner = Miner::with_spec(&Spec::new_instant());
let c = generate_dummy_client(2);
let client = c.reference().as_ref();