Merge branch 'master' into grpc-rs

This commit is contained in:
Paul Hauner
2019-01-22 12:58:17 +11:00
21 changed files with 1005 additions and 471 deletions

View File

@@ -1,4 +1,4 @@
use chain::{BlockProcessingOutcome, BeaconChain};
use chain::{BeaconChain, BlockProcessingOutcome};
use db::{
stores::{BeaconBlockStore, BeaconStateStore},
MemoryDB,