Fix edgecase in tipset skipcache

filecoin-project · May 27, 2021 · 10b9313 · 10b9313
1 parent 21b4741
commit 10b9313
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/chain/store/index.go b/chain/store/index.go
@@ -107,6 +107,9 @@ func (ci *ChainIndex) fillCache(tsk types.TipSetKey) (*lbEntry, error) {
 	}
 
 	rheight -= ci.skipLength
+	if rheight < 0 {
+		rheight = 0
+	}
 
 	var skipTarget *types.TipSet
 	if parent.Height() < rheight {

diff --git a/chain/sync_test.go b/chain/sync_test.go
@@ -895,6 +895,7 @@ func TestSyncCheckpointEarlierThanHead(t *testing.T) {
 func TestDrandNull(t *testing.T) {
 	H := 10
 	v5h := abi.ChainEpoch(50)
+	ov5h := build.UpgradeHyperdriveHeight
 	build.UpgradeHyperdriveHeight = v5h
 	tu := prepSyncTestWithV5Height(t, H, v5h)
 
@@ -942,4 +943,6 @@ func TestDrandNull(t *testing.T) {
 	require.NoError(t, err)
 
 	require.Equal(t, []byte(rand), expectedRand)
+	build.UpgradeHyperdriveHeight = ov5h
+
 }