debugging test failure

This commit is contained in:
whyrusleeping
2020-02-27 15:14:15 -08:00
parent e4dcb7441b
commit d8dda1ee66
4 changed files with 21 additions and 15 deletions
+9 -5
View File
@@ -109,17 +109,21 @@ func LoadGenesis(genBytes []byte) func(dtypes.ChainBlockstore) Genesis {
return func() (header *types.BlockHeader, e error) {
c, err := car.LoadCar(bs, bytes.NewReader(genBytes))
if err != nil {
return nil, err
return nil, xerrors.Errorf("loading genesis car file failed: %w", err)
}
if len(c.Roots) != 1 {
return nil, xerrors.New("expected genesis file to have one root")
}
root, err := bs.Get(c.Roots[0])
if err != nil {
return &types.BlockHeader{}, err
return nil, err
}
return types.DecodeBlock(root.RawData())
h, err := types.DecodeBlock(root.RawData())
if err != nil {
return nil, xerrors.Errorf("decoding block failed: %w", err)
}
return h, nil
}
}
}
@@ -130,12 +134,12 @@ func SetGenesis(cs *store.ChainStore, g Genesis) error {
return nil // already set, noop
}
if err != datastore.ErrNotFound {
return err
return xerrors.Errorf("getting genesis block failed: %w", err)
}
genesis, err := g()
if err != nil {
return err
return xerrors.Errorf("genesis func failed: %w", err)
}
return cs.SetGenesis(genesis)
+2 -2
View File
@@ -36,14 +36,14 @@ func MakeGenesisMem(out io.Writer, template genesis.Template) func(bs dtypes.Cha
glog.Warn("Generating new random genesis block, note that this SHOULD NOT happen unless you are setting up new network")
b, err := genesis2.MakeGenesisBlock(context.TODO(), bs, syscalls, template)
if err != nil {
return nil, err
return nil, xerrors.Errorf("make genesis block failed: %w", err)
}
offl := offline.Exchange(bs)
blkserv := blockservice.New(bs, offl)
dserv := merkledag.NewDAGService(blkserv)
if err := car.WriteCarWithWalker(context.TODO(), dserv, []cid.Cid{b.Genesis.Cid()}, out, gen.CarWalkFunc); err != nil {
return nil, err
return nil, xerrors.Errorf("failed to write car file: %w", err)
}
return b.Genesis, nil