cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Fix genesis writing

Browse Source
This commit is contained in:
Łukasz Magiera 2020-02-22 13:03:41 +01:00
parent b12482df89
commit 99c0e14fd8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
node/modules/testing/genesis.go
View File

@ -20,6 +20,7 @@ import (
"github.com/filecoin-project/specs-actors/actors/runtime" "github.com/filecoin-project/specs-actors/actors/runtime"
"github.com/filecoin-project/lotus/chain/gen"
genesis2 "github.com/filecoin-project/lotus/chain/gen/genesis" genesis2 "github.com/filecoin-project/lotus/chain/gen/genesis"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
"github.com/filecoin-project/lotus/genesis" "github.com/filecoin-project/lotus/genesis"
@ -41,7 +42,7 @@ func MakeGenesisMem(out io.Writer, template genesis.Template) func(bs dtypes.Cha
blkserv := blockservice.New(bs, offl) blkserv := blockservice.New(bs, offl)
dserv := merkledag.NewDAGService(blkserv) dserv := merkledag.NewDAGService(blkserv)
if err := car.WriteCar(context.TODO(), dserv, []cid.Cid{b.Genesis.Cid()}, out); err != nil { if err := car.WriteCarWithWalker(context.TODO(), dserv, []cid.Cid{b.Genesis.Cid()}, out, gen.CarWalkFunc); err != nil {
return nil, err return nil, err
} }
@ -75,7 +76,7 @@ func MakeGenesis(outFile, genesisTemplate string) func(bs dtypes.ChainBlockstore
b, err := genesis2.MakeGenesisBlock(context.TODO(), bs, syscalls, template) b, err := genesis2.MakeGenesisBlock(context.TODO(), bs, syscalls, template)
if err != nil { if err != nil {
return nil, err return nil, xerrors.Errorf("make genesis block: %w", err)
} }
fmt.Printf("GENESIS MINER ADDRESS: t0%d\n", genesis2.MinerStart) fmt.Printf("GENESIS MINER ADDRESS: t0%d\n", genesis2.MinerStart)
@ -89,7 +90,7 @@ func MakeGenesis(outFile, genesisTemplate string) func(bs dtypes.ChainBlockstore
blkserv := blockservice.New(bs, offl) blkserv := blockservice.New(bs, offl)
dserv := merkledag.NewDAGService(blkserv) dserv := merkledag.NewDAGService(blkserv)
if err := car.WriteCar(context.TODO(), dserv, []cid.Cid{b.Genesis.Cid()}, f); err != nil { if err := car.WriteCarWithWalker(context.TODO(), dserv, []cid.Cid{b.Genesis.Cid()}, f, gen.CarWalkFunc); err != nil {
return nil, err return nil, err
} }