diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-19 23:06:56 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-19 23:07:40 +0800 |
| commit | 8f3a7e41deff4084b166aca1337258077bd2a3e6 (patch) | |
| tree | ddc62daeec7a44c2baacb986f8c9d76df25a5976 /cmd | |
| parent | 4683f9c0a71fd42e749da46ac56c6ba76f379931 (diff) | |
| parent | 7180699d401e64b52447ccb2cfb33004b7deb672 (diff) | |
| download | dexon-8f3a7e41deff4084b166aca1337258077bd2a3e6.tar dexon-8f3a7e41deff4084b166aca1337258077bd2a3e6.tar.gz dexon-8f3a7e41deff4084b166aca1337258077bd2a3e6.tar.bz2 dexon-8f3a7e41deff4084b166aca1337258077bd2a3e6.tar.lz dexon-8f3a7e41deff4084b166aca1337258077bd2a3e6.tar.xz dexon-8f3a7e41deff4084b166aca1337258077bd2a3e6.tar.zst dexon-8f3a7e41deff4084b166aca1337258077bd2a3e6.zip | |
Merge branch 'rlp-size-validation' of https://github.com/fjl/go-ethereum into fjl-rlp-size-validation
Conflicts:
eth/protocol.go
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/rlpdump/main.go | 2 | ||||
| -rw-r--r-- | cmd/utils/cmd.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go index 8567dcff8..528ccc6bd 100644 --- a/cmd/rlpdump/main.go +++ b/cmd/rlpdump/main.go @@ -78,7 +78,7 @@ func main() { os.Exit(2) } - s := rlp.NewStream(r) + s := rlp.NewStream(r, 0) for { if err := dump(s, 0); err != nil { if err != io.EOF { diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 7286f5c5e..64faf6ad1 100644 --- 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 |