Merge branch 'kishan/fix/syncing' of github.com:ChainSafe/gossamer in…

…to kishan/fix/syncing
ChainSafe · Feb 14, 2023 · 89dce6d · 89dce6d
2 parents 8e8756a + 2cf149b
commit 89dce6d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/dot/state/block.go b/dot/state/block.go
@@ -293,14 +293,13 @@ func (bs *BlockState) GetAllDescendants(hash common.Hash) ([]common.Hash, error)
 	}
 
 	for _, nextBlockHash := range nextBlockHashes {
-
 		nextHeader, err := bs.GetHeader(nextBlockHash)
 		if err != nil {
 			return nil, fmt.Errorf("getting header from block hash %s: %w", nextBlockHash, err)
 		}
 		// next block is not a descendant of the block for the given hash
 		if nextHeader.ParentHash != hash {
-			return nil, nil
+			return []common.Hash{hash}, nil
 		}
 
 		nextDescendants, err := bs.bt.GetAllDescendants(nextBlockHash)

diff --git a/lib/blocktree/helpers_test.go b/lib/blocktree/helpers_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-var zeroHash, _ = common.HexToHash("0x00")
+var zeroHash = common.MustHexToHash("0x00")
 var testHeader = &types.Header{
 	ParentHash: zeroHash,
 	Number:     0,