Merge branch 'rlp-size-validation' of https://github.com/fjl/go-ethereum into fjl-rlp-size-validation

Conflicts: eth/protocol.go
2015-04-19 17:06:56 +02:00
parent 4683f9c0a7 7180699d40
commit 8f3a7e41de
13 changed files with 481 additions and 233 deletions
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@ -154,7 +154,7 @@ func ImportChain(chainmgr *core.ChainManager, fn string) error {
 	defer fh.Close()

 	chainmgr.Reset()
-	stream := rlp.NewStream(fh)
+	stream := rlp.NewStream(fh, 0)
 	var i, n int

 	batchSize := 2500