From eaddb8abe80ccb93ae67c690a52558c39fefff31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Mon, 11 Nov 2019 20:30:49 +0100 Subject: [PATCH] sync: use muliterror in ValidateBlock --- chain/sync.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/chain/sync.go b/chain/sync.go index 68e059e5f..cc3f99205 100644 --- a/chain/sync.go +++ b/chain/sync.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "github.com/hashicorp/go-multierror" "sync" "time" @@ -583,13 +584,15 @@ func (syncer *Syncer) ValidateBlock(ctx context.Context, b *types.FullBlock) err winnerCheck, msgsCheck, } + + var merr error for _, fut := range await { 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 {