merge

2015-03-19 16:59:13 +01:00
parent ce063e8d9c e540a75030
commit b5a71d955c
12 changed files with 273 additions and 176 deletions
--- a/core/chain_makers.go
+++ b/core/chain_makers.go
@ -93,7 +93,7 @@ func makeChain(bman *BlockProcessor, parent *types.Block, max int, db common.Dat
 	blocks := make(types.Blocks, max)
 	for i := 0; i < max; i++ {
 		block := makeBlock(bman, parent, i, db, seed)
-		td, err := bman.processWithParent(block, parent)
+		td, _, err := bman.processWithParent(block, parent)
 		if err != nil {
 			fmt.Println("process with parent failed", err)
 			panic(err)