Applies assertion funcs to beacon-chain/db tests (#6938)

* part1
* go tidy
* Merge branch 'go-tidy' into apply-testutils-assertions-to-beaconchain-db
* updated beacon-chain/db/kv tests
* Merge branch 'master' into apply-testutils-assertions-to-beaconchain-db
* Merge refs/heads/master into apply-testutils-assertions-to-beaconchain-db
* Merge refs/heads/master into apply-testutils-assertions-to-beaconchain-db

Author: farazdagi

beacon-chain/db/filters/BUILD.bazel

@@ -15,4 +15,5 @@ go_test(
     name = "go_default_test",
     srcs = ["filter_test.go"],
     embed = [":go_default_library"],
+    deps = ["//shared/testutil/assert:go_default_library"],
 )

beacon-chain/db/filters/filter_test.go

@@ -2,6 +2,8 @@ package filters
 
 import (
 	"testing"
+
+	"github.com/prysmaticlabs/prysm/shared/testutil/assert"
 )
 
 func TestQueryFilter_ChainsCorrectly(t *testing.T) {
@@ -11,9 +13,7 @@ func TestQueryFilter_ChainsCorrectly(t *testing.T) {
 		SetParentRoot([]byte{3, 4, 5})
 
 	filterSet := f.Filters()
-	if len(filterSet) != 3 {
-		t.Errorf("Expected 3 filters to have been set, received %d", len(filterSet))
-	}
+	assert.Equal(t, 3, len(filterSet), "Unexpected number of filters")
 	for k, v := range filterSet {
 		switch k {
 		case StartSlot:

beacon-chain/db/kv/BUILD.bazel

@@ -82,12 +82,15 @@ go_test(
     deps = [
         "//beacon-chain/cache:go_default_library",
         "//beacon-chain/db/filters:go_default_library",
+        "//beacon-chain/state:go_default_library",
         "//beacon-chain/state/stateutil:go_default_library",
         "//proto/beacon/p2p/v1:go_default_library",
         "//proto/testing:go_default_library",
         "//shared/bytesutil:go_default_library",
         "//shared/params:go_default_library",
         "//shared/testutil:go_default_library",
+        "//shared/testutil/assert:go_default_library",
+        "//shared/testutil/require:go_default_library",
         "@com_github_ethereum_go_ethereum//common:go_default_library",
         "@com_github_gogo_protobuf//proto:go_default_library",
         "@com_github_prysmaticlabs_ethereumapis//eth/v1alpha1:go_default_library",

beacon-chain/db/kv/archived_point_test.go

@@ -5,6 +5,8 @@ import (
 	"testing"
 
 	"github.com/prysmaticlabs/prysm/shared/testutil"
+	"github.com/prysmaticlabs/prysm/shared/testutil/assert"
+	"github.com/prysmaticlabs/prysm/shared/testutil/require"
 )
 
 func TestArchivedPointIndexRoot_CanSaveRetrieve(t *testing.T) {
@@ -14,67 +16,33 @@ func TestArchivedPointIndexRoot_CanSaveRetrieve(t *testing.T) {
 	r1 := [32]byte{'A'}
 
 	received := db.ArchivedPointRoot(ctx, i1)
-	if r1 == received {
-		t.Fatal("Should not have been saved")
-	}
+	require.NotEqual(t, r1, received, "Should not have been saved")
 	st := testutil.NewBeaconState()
-	if err := st.SetSlot(i1); err != nil {
-		t.Fatal(err)
-	}
-	if err := db.SaveState(ctx, st, r1); err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, st.SetSlot(i1))
+	require.NoError(t, db.SaveState(ctx, st, r1))
 	received = db.ArchivedPointRoot(ctx, i1)
-	if r1 != received {
-		t.Error("Should have been saved")
-	}
+	assert.Equal(t, r1, received, "Should have been saved")
 }
 
 func TestLastArchivedPoint_CanRetrieve(t *testing.T) {
 	db := setupDB(t)
 	ctx := context.Background()
 	i, err := db.LastArchivedSlot(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if i != 0 {
-		t.Error("Did not get correct index")
-	}
+	require.NoError(t, err)
+	assert.Equal(t, uint64(0), i, "Did not get correct index")
 
 	st := testutil.NewBeaconState()
-	if err := db.SaveState(ctx, st, [32]byte{'A'}); err != nil {
-		t.Error(err)
-	}
+	assert.NoError(t, db.SaveState(ctx, st, [32]byte{'A'}))
+	assert.Equal(t, [32]byte{'A'}, db.LastArchivedRoot(ctx), "Did not get wanted root")
 
-	if db.LastArchivedRoot(ctx) != [32]byte{'A'} {
-		t.Error("Did not get wanted root")
-	}
+	assert.NoError(t, st.SetSlot(2))
+	assert.NoError(t, db.SaveState(ctx, st, [32]byte{'B'}))
+	assert.Equal(t, [32]byte{'B'}, db.LastArchivedRoot(ctx))
 
-	if err := st.SetSlot(2); err != nil {
-		t.Error(err)
-	}
-
-	if err := db.SaveState(ctx, st, [32]byte{'B'}); err != nil {
-		t.Error(err)
-	}
-
-	if db.LastArchivedRoot(ctx) != [32]byte{'B'} {
-		t.Error("Did not get wanted root")
-	}
-
-	if err := st.SetSlot(3); err != nil {
-		t.Error(err)
-	}
-
-	if err := db.SaveState(ctx, st, [32]byte{'C'}); err != nil {
-		t.Fatal(err)
-	}
+	assert.NoError(t, st.SetSlot(3))
+	assert.NoError(t, db.SaveState(ctx, st, [32]byte{'C'}))
 
 	i, err = db.LastArchivedSlot(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if i != 3 {
-		t.Error("Did not get correct index")
-	}
+	require.NoError(t, err)
+	assert.Equal(t, uint64(3), i, "Did not get correct index")
 }

beacon-chain/db/kv/backup_test.go

@@ -9,6 +9,7 @@ import (
 	eth "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
 	"github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil"
 	"github.com/prysmaticlabs/prysm/shared/testutil"
+	"github.com/prysmaticlabs/prysm/shared/testutil/require"
 )
 
 func TestStore_Backup(t *testing.T) {
@@ -17,30 +18,16 @@ func TestStore_Backup(t *testing.T) {
 
 	head := &eth.SignedBeaconBlock{Block: &eth.BeaconBlock{Slot: 5000}}
 
-	if err := db.SaveBlock(ctx, head); err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, db.SaveBlock(ctx, head))
 	root, err := stateutil.BlockRoot(head.Block)
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 	st := testutil.NewBeaconState()
-	if err := db.SaveState(ctx, st, root); err != nil {
-		t.Fatal(err)
-	}
-	if err := db.SaveHeadBlockRoot(ctx, root); err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, db.SaveState(ctx, st, root))
+	require.NoError(t, db.SaveHeadBlockRoot(ctx, root))
 
-	if err := db.Backup(ctx); err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, db.Backup(ctx))
 
 	files, err := ioutil.ReadDir(path.Join(db.databasePath, backupsDirectoryName))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(files) == 0 {
-		t.Fatal("No backups created.")
-	}
+	require.NoError(t, err)
+	require.NotEqual(t, 0, len(files), "No backups created")
 }