fix TestHandShakeReplayAll

consensus/replay_test.go

@@ -571,12 +571,6 @@ func TestSimulateValidatorsChange(t *testing.T) {
 		}
 		sim.Chain = append(sim.Chain, b)
 		commit := css[0].blockStore.LoadBlockCommit(int64(i))
-		if commit != nil {
-			fmt.Println(i, commit.BlockID.DataAvailabilityHeader.IsZero(), b.LastCommit.BlockID.DataAvailabilityHeader.IsZero())
-		} else {
-			fmt.Println(b.LastCommit.BlockID.DataAvailabilityHeader.IsZero())
-		}
-
 		sim.Commits = append(sim.Commits, commit)
 	}
 
@@ -1017,7 +1011,6 @@ func makeBlocks(n int, state *sm.State, privVal types.PrivValidator) []*types.Bl
 
 func makeBlock(state sm.State, lastBlock *types.Block, lastBlockMeta *types.BlockMeta,
 	privVal types.PrivValidator, height int64) (*types.Block, *types.PartSet) {
-
 	lastCommit := types.NewCommit(height-1, 0, types.BlockID{}, nil)
 	if height > 1 {
 		vote, _ := types.MakeVote(

store/store.go

@@ -129,15 +129,7 @@ func (bs *BlockStore) LoadBlock(ctx context.Context, height int64) (*types.Block
 		return nil, fmt.Errorf("failuring retrieve block data from ipfs: %w", err)
 	}
 
-	var lastCommit *types.Commit
-	switch {
-	case height > bs.Height()-1:
-		lastCommit = bs.LoadSeenCommit(height - 1)
-	case height == 0:
-		lastCommit = nil
-	default:
-		lastCommit = bs.LoadBlockCommit(height - 1)
-	}
+	lastCommit := bs.LoadBlockCommit(height - 1)
 
 	block := &types.Block{
 		Header:                 blockMeta.Header,