Fix identical expressions (#7069)

* Fix ident exps
* Merge refs/heads/master into fix-ident-exp

Author: terencechain

beacon-chain/core/epoch/precompute/spectest/rewards_penalties_test.go

@@ -55,7 +55,7 @@ func runPrecomputeRewardsAndPenaltiesTest(t *testing.T, testFolderPath string) {
 	require.NoError(t, err)
 	pRewards, err := precompute.ProposersDelta(preBeaconState, bp, vp)
 	require.NoError(t, err)
-	if len(rewards) != len(penalties) && len(pRewards) != len(pRewards) {
+	if len(rewards) != len(penalties) && len(rewards) != len(pRewards) {
 		t.Fatal("Incorrect lengths")
 	}
 	for i, reward := range rewards {

beacon-chain/state/stategen/replay_test.go

@@ -363,16 +363,16 @@ func TestLastSavedState_Genesis(t *testing.T) {
 	}
 
 	gBlk := &ethpb.SignedBeaconBlock{Block: &ethpb.BeaconBlock{}}
+	gState := testutil.NewBeaconState()
 	gRoot, err := stateutil.BlockRoot(gBlk.Block)
 	require.NoError(t, err)
 	require.NoError(t, s.beaconDB.SaveBlock(ctx, gBlk))
 	require.NoError(t, s.beaconDB.SaveGenesisBlockRoot(ctx, gRoot))
+	require.NoError(t, s.beaconDB.SaveState(ctx, gState, gRoot))
 
-	savedRoot, err := s.lastSavedState(ctx, 0)
+	savedState, err := s.lastSavedState(ctx, 0)
 	require.NoError(t, err)
-	if savedRoot != savedRoot {
-		t.Error("Did not save genesis root")
-	}
+	require.DeepEqual(t, gState.InnerStateUnsafe(), savedState.InnerStateUnsafe())
 }
 
 func TestLastSavedState_CanGet(t *testing.T) {