From ec1dd85c444c1332d4089d8348cc736fedb2d3c8 Mon Sep 17 00:00:00 2001 From: terence tsao Date: Thu, 20 Aug 2020 15:34:52 -0700 Subject: [PATCH] Fix identical expressions (#7069) * Fix ident exps * Merge refs/heads/master into fix-ident-exp --- .../epoch/precompute/spectest/rewards_penalties_test.go | 2 +- beacon-chain/state/stategen/replay_test.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/beacon-chain/core/epoch/precompute/spectest/rewards_penalties_test.go b/beacon-chain/core/epoch/precompute/spectest/rewards_penalties_test.go index eb7b0d2673..0d0acab2f8 100644 --- a/beacon-chain/core/epoch/precompute/spectest/rewards_penalties_test.go +++ b/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 { diff --git a/beacon-chain/state/stategen/replay_test.go b/beacon-chain/state/stategen/replay_test.go index ff31786583..f48a6b88ad 100644 --- a/beacon-chain/state/stategen/replay_test.go +++ b/beacon-chain/state/stategen/replay_test.go @@ -363,16 +363,16 @@ func TestLastSavedState_Genesis(t *testing.T) { } gBlk := ðpb.SignedBeaconBlock{Block: ðpb.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) {