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

sync: use muliterror in ValidateBlock

Browse Source
This commit is contained in:
Łukasz Magiera 2019-11-11 20:30:49 +01:00
parent d9fe9a6ea4
commit eaddb8abe8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chain/sync.go
View File

@ -4,6 +4,7 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"github.com/hashicorp/go-multierror"
"sync" "sync"
"time" "time"
@ -583,13 +584,15 @@ func (syncer *Syncer) ValidateBlock(ctx context.Context, b *types.FullBlock) err
winnerCheck, winnerCheck,
msgsCheck, msgsCheck,
} }
var merr error
for _, fut := range await { for _, fut := range await {
if err := fut.AwaitContext(ctx); err != nil { if err := fut.AwaitContext(ctx); err != nil {
return err err = multierror.Append(merr, err)
} }
} }
return nil return merr
} }
func (syncer *Syncer) checkBlockMessages(ctx context.Context, b *types.FullBlock, baseTs *types.TipSet) error { func (syncer *Syncer) checkBlockMessages(ctx context.Context, b *types.FullBlock, baseTs *types.TipSet) error {