feat: remove gotest.tools

Author: viteshan

client/sbp_upgrade_test.go

@@ -5,31 +5,31 @@ import (
 	"strconv"
 	"testing"
 
-	"gotest.tools/assert"
+	"github.com/stretchr/testify/assert"
 
 	"github.com/vitelabs/go-vite/v2/common/types"
 )
 
 func TestSBPUpgrade(t *testing.T) {
 	rpc, err := NewRpcClient(RawUrl)
-	assert.NilError(t, err)
+	assert.NoError(t, err)
 
 	sbpMap := make(map[types.Address]string)
 	versionMap := make(map[string]uint32)
 
 	sbpList, err := rpc.GetSBPVoteList()
-	assert.NilError(t, err)
+	assert.NoError(t, err)
 
 	for _, sbp := range sbpList {
 		fmt.Println(sbp.Name, sbp.BlockProducingAddress)
 		sbpMap[sbp.BlockProducingAddress] = sbp.Name
 	}
 
 	latestHeight, err := strconv.ParseUint(rpc.GetSnapshotChainHeight(), 10, 64)
-	assert.NilError(t, err)
+	assert.NoError(t, err)
 
 	blocks, err := rpc.GetSnapshotBlocks(latestHeight, 500)
-	assert.NilError(t, err)
+	assert.NoError(t, err)
 
 	for _, block := range blocks {
 		producer := block.Producer

go.mod

@@ -36,5 +36,4 @@ require (
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce
 	gopkg.in/urfave/cli.v1 v1.20.0
-	gotest.tools v2.2.0+incompatible
 )

go.sum

@@ -184,5 +184,3 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
-gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=

ledger/chain/block/block_db_test.go

@@ -5,8 +5,7 @@ import (
 	"path"
 	"testing"
 
-	"gotest.tools/assert"
-
+	"github.com/stretchr/testify/assert"
 	"github.com/vitelabs/go-vite/v2/common"
 	"github.com/vitelabs/go-vite/v2/crypto"
 	chain_file_manager "github.com/vitelabs/go-vite/v2/ledger/chain/file_manager"
@@ -15,7 +14,7 @@ import (
 func TestReadSnapshotBlocks(t *testing.T) {
 	chainDir := path.Join(common.HomeDir(), ".gvite/mockdata/ledger_2101_2")
 	db, err := NewBlockDB(chainDir)
-	assert.NilError(t, err)
+	assert.NoError(t, err)
 	statusList := db.GetStatus()
 	for _, status := range statusList {
 		t.Log(status.Name, status.Count, status.Size, status.Status)
@@ -29,7 +28,7 @@ func TestReadSnapshotBlocks(t *testing.T) {
 		if err == io.EOF {
 			break
 		}
-		assert.NilError(t, err)
+		assert.NoError(t, err)
 		if nextLocation == nil {
 			break
 		}
@@ -45,7 +44,7 @@ func TestReadSnapshotBlocks(t *testing.T) {
 func TestReadAccountBlocks(t *testing.T) {
 	chainDir := path.Join(common.HomeDir(), ".gvite/mockdata/ledger_2101_2")
 	db, err := NewBlockDB(chainDir)
-	assert.NilError(t, err)
+	assert.NoError(t, err)
 	statusList := db.GetStatus()
 	for _, status := range statusList {
 		t.Log(status.Name, status.Count, status.Size, status.Status)
@@ -59,7 +58,7 @@ func TestReadAccountBlocks(t *testing.T) {
 		if err == io.EOF {
 			break
 		}
-		assert.NilError(t, err)
+		assert.NoError(t, err)
 		if nextLocation == nil {
 			break
 		}
@@ -74,7 +73,7 @@ func TestReadAccountBlocks(t *testing.T) {
 func TestReadLocation(t *testing.T) {
 	chainDir := path.Join(common.HomeDir(), ".gvite/mockdata/ledger_2101_1")
 	db, err := NewBlockDB(chainDir)
-	assert.NilError(t, err)
+	assert.NoError(t, err)
 	statusList := db.GetStatus()
 	for _, status := range statusList {
 		t.Log(status.Name, status.Count, status.Size, status.Status)
@@ -88,33 +87,33 @@ func TestDiffBlocksDB(t *testing.T) {
 	chainDirA := path.Join(common.HomeDir(), ".gvite/mockdata/ledger_2101_1")
 	chainDirB := path.Join(common.HomeDir(), ".gvite/mockdata/ledger_2101_2")
 	dbA, err := NewBlockDB(chainDirA)
-	assert.NilError(t, err)
+	assert.NoError(t, err)
 	dbB, err := NewBlockDB(chainDirB)
-	assert.NilError(t, err)
+	assert.NoError(t, err)
 
 	location := chain_file_manager.NewLocation(1, 7333187)
 	//printLocationContext(t, location, dbA)
 	//printLocationContext(t, location, dbB)
 
 	for {
 		bytA, nextLocationA, err := dbA.ReadUnitBytes(location)
-		assert.NilError(t, err)
+		assert.NoError(t, err)
 		bytB, nextLocationB, err := dbB.ReadUnitBytes(location)
-		assert.NilError(t, err)
+		assert.NoError(t, err)
 
 		t.Log(location.FileId, location.Offset)
 		assert.Equal(t, nextLocationA.FileId, nextLocationB.FileId, nextLocationA.String(), nextLocationB.String(), location.String())
 		assert.Equal(t, nextLocationA.Offset, nextLocationB.Offset, nextLocationA.String(), nextLocationB.String(), location.String())
 		assert.Equal(t, len(bytA), len(bytB))
-		assert.DeepEqual(t, crypto.Hash256(bytA), crypto.Hash256(bytB))
+		assert.EqualValues(t, crypto.Hash256(bytA), crypto.Hash256(bytB))
 
 		location = nextLocationA
 	}
 }
 
 func printLocationContext(t *testing.T, location *chain_file_manager.Location, db *BlockDB) {
 	sb, ab, nextLocation, err := db.ReadUnit(location)
-	assert.NilError(t, err)
+	assert.NoError(t, err)
 	if sb != nil {
 		t.Log("snapshot block", sb.Height, sb.Hash)
 	}

ledger/pipeline/pipeline_blocks_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"gotest.tools/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestPipeline(t *testing.T) {

tools/toposort/topsort_test.go

@@ -4,7 +4,7 @@ import (
 	"sort"
 	"testing"
 
-	"gotest.tools/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 type items struct {

wallet/account_test.go

@@ -3,7 +3,7 @@ package wallet
 import (
 	"testing"
 
-	"gotest.tools/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestAccount(t *testing.T) {