aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/utils/cmd.go
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2015-03-18 20:36:48 +0800
committerFelix Lange <fjl@twurst.com>2015-03-18 20:36:48 +0800
commitb5b83db450974f70f4bc25f280cc6ec9193f8e19 (patch)
tree88127007dcf407a6b991562e455a1be6accd04a0 /cmd/utils/cmd.go
parentc298148a7f0890cd5ed62d2a91cc81431b2731f1 (diff)
downloaddexon-b5b83db450974f70f4bc25f280cc6ec9193f8e19.tar
dexon-b5b83db450974f70f4bc25f280cc6ec9193f8e19.tar.gz
dexon-b5b83db450974f70f4bc25f280cc6ec9193f8e19.tar.bz2
dexon-b5b83db450974f70f4bc25f280cc6ec9193f8e19.tar.lz
dexon-b5b83db450974f70f4bc25f280cc6ec9193f8e19.tar.xz
dexon-b5b83db450974f70f4bc25f280cc6ec9193f8e19.tar.zst
dexon-b5b83db450974f70f4bc25f280cc6ec9193f8e19.zip
core: use package rlp to encode blocks
This also changes the chain export format so there is no enclosing list around the blocks, which enables streaming export.
Diffstat (limited to 'cmd/utils/cmd.go')
-rw-r--r--cmd/utils/cmd.go37
1 files changed, 22 insertions, 15 deletions
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index 74fd5334e..66e89abef 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -23,14 +23,15 @@ package utils
import (
"fmt"
+ "io"
"os"
"os/signal"
"regexp"
+ "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/eth"
- "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/rlp"
)
@@ -152,29 +153,35 @@ func ImportChain(chainmgr *core.ChainManager, fn string) error {
}
defer fh.Close()
- var blocks types.Blocks
- if err := rlp.Decode(fh, &blocks); err != nil {
- return err
- }
-
chainmgr.Reset()
- if err := chainmgr.InsertChain(blocks); err != nil {
- return err
+ stream := rlp.NewStream(fh)
+ var i int
+ for ; ; i++ {
+ var b types.Block
+ err := stream.Decode(&b)
+ if err == io.EOF {
+ break
+ } else if err != nil {
+ return fmt.Errorf("at block %d: %v", i, err)
+ }
+ if err := chainmgr.InsertChain(types.Blocks{b}); err != nil {
+ return fmt.Errorf("invalid block %d: %v", i, err)
+ }
}
- fmt.Printf("imported %d blocks\n", len(blocks))
-
+ fmt.Printf("imported %d blocks\n", i)
return nil
}
func ExportChain(chainmgr *core.ChainManager, fn string) error {
fmt.Printf("exporting blockchain '%s'\n", fn)
-
- data := chainmgr.Export()
-
- if err := common.WriteFile(fn, data); err != nil {
+ fh, err := os.OpenFile(fn, os.O_WRONLY|os.O_TRUNC, os.ModePerm)
+ if err != nil {
+ return err
+ }
+ defer fh.Close()
+ if err := chainmgr.Export(fh); err != nil {
return err
}
fmt.Printf("exported blockchain\n")
-
return nil
}