From 4be4e96ceb7193a9ab1ec632e9002f92488a3ea2 Mon Sep 17 00:00:00 2001 From: William Banfield Date: Fri, 20 May 2022 10:23:25 -0400 Subject: [PATCH] use empty extended commit when not enabled --- internal/blocksync/reactor.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/internal/blocksync/reactor.go b/internal/blocksync/reactor.go index 304d1b824..4ea8fb034 100644 --- a/internal/blocksync/reactor.go +++ b/internal/blocksync/reactor.go @@ -200,15 +200,11 @@ func (r *Reactor) respondToPeer(ctx context.Context, msg *bcproto.BlockRequest, var extCommit *types.ExtendedCommit if state.ConsensusParams.ABCI.VoteExtensionsEnabled(msg.Height) { extCommit = r.store.LoadBlockExtendedCommit(msg.Height) - } else { - c := r.store.LoadBlockCommit(msg.Height) - if extCommit != nil { - extCommit = c.WrappedExtendedCommit() + if extCommit == nil { + return fmt.Errorf("found block in store with no extended commit: %v", block) } } - if extCommit == nil { - return fmt.Errorf("found block in store with no commit and no extended commit: %v", block) - } + blockProto, err := block.ToProto() if err != nil { return fmt.Errorf("failed to convert block to protobuf: %w", err)