From ba41d29b505ca0f225c9d4467430000b70e87c2d Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Sun, 4 Jul 2021 23:11:07 +0200 Subject: [PATCH] revert returning empty block (#6647) --- rpc/core/blocks.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rpc/core/blocks.go b/rpc/core/blocks.go index 6e92a8805..d57f76a99 100644 --- a/rpc/core/blocks.go +++ b/rpc/core/blocks.go @@ -96,11 +96,12 @@ func (env *Environment) Block(ctx *rpctypes.Context, heightPtr *int64) (*ctypes. return nil, err } - block := env.BlockStore.LoadBlock(height) blockMeta := env.BlockStore.LoadBlockMeta(height) - if blockMeta == nil || block == nil { - return &ctypes.ResultBlock{BlockID: types.BlockID{}, Block: &types.Block{}}, nil + if blockMeta == nil { + return &ctypes.ResultBlock{BlockID: types.BlockID{}, Block: nil}, nil } + + block := env.BlockStore.LoadBlock(height) return &ctypes.ResultBlock{BlockID: blockMeta.BlockID, Block: block}, nil }