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

Merge branch 'fix-chain-export' of github.com:zgfzgf/lotus into zgfzgf-fix-chain-export

Browse Source
This commit is contained in:
Łukasz Magiera 2020-10-22 15:56:42 +02:00
commit 40872e9d90
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
chain/store/store.go
View File

@ -1312,11 +1312,13 @@ func (cs *ChainStore) WalkSnapshot(ctx context.Context, ts *types.TipSet, inclRe
var cids []cid.Cid var cids []cid.Cid
if !skipOldMsgs || b.Height > ts.Height()-inclRecentRoots { if !skipOldMsgs || b.Height > ts.Height()-inclRecentRoots {
mcids, err := recurseLinks(cs.bs, walked, b.Messages, []cid.Cid{b.Messages}) if walked.Visit(b.Messages) {
if err != nil { mcids, err := recurseLinks(cs.bs, walked, b.Messages, []cid.Cid{b.Messages})
return xerrors.Errorf("recursing messages failed: %w", err) if err != nil {
return xerrors.Errorf("recursing messages failed: %w", err)
}
cids = mcids
} }
cids = mcids
} }
if b.Height > 0 { if b.Height > 0 {
@ -1331,12 +1333,14 @@ func (cs *ChainStore) WalkSnapshot(ctx context.Context, ts *types.TipSet, inclRe
out := cids out := cids
if b.Height == 0 || b.Height > ts.Height()-inclRecentRoots { if b.Height == 0 || b.Height > ts.Height()-inclRecentRoots {
cids, err := recurseLinks(cs.bs, walked, b.ParentStateRoot, []cid.Cid{b.ParentStateRoot}) if walked.Visit(b.ParentStateRoot) {
if err != nil { cids, err := recurseLinks(cs.bs, walked, b.ParentStateRoot, []cid.Cid{b.ParentStateRoot})
return xerrors.Errorf("recursing genesis state failed: %w", err) if err != nil {
} return xerrors.Errorf("recursing genesis state failed: %w", err)
}
out = append(out, cids...) out = append(out, cids...)
}
} }
for _, c := range out { for _, c := range out {