Test go file

Author: zhugelianglongming

bcs/consensus/mock/mock_consensus.go

@@ -1,7 +1,6 @@
 package mock
 
 import (
-	"errors"
 	"path/filepath"
 	"time"
 
@@ -17,12 +16,9 @@ import (
 
 var (
 	BcName = "xuper5"
-	nodeIp = "/ip4/127.0.0.1/tcp/47101/p2p/QmVcSF4F7rTdsvUJqsik98tXRXMBUqL5DSuBpyYKVhjuG4"
 	priKey = `{"Curvname":"P-256","X":74695617477160058757747208220371236837474210247114418775262229497812962582435,"Y":51348715319124770392993866417088542497927816017012182211244120852620959209571,"D":29079635126530934056640915735344231956621504557963207107451663058887647996601}`
 	PubKey = `{"Curvname":"P-256","X":74695617477160058757747208220371236837474210247114418775262229497812962582435,"Y":51348715319124770392993866417088542497927816017012182211244120852620959209571}`
 	Miner  = "dpzuVdosQrF2kmzumhVeFQZa1aYcdgFpN"
-
-	blockSetItemErr = errors.New("item invalid")
 )
 
 func NewFakeLogger() logs.Logger {

bcs/consensus/pow/common.go

@@ -62,7 +62,7 @@ func GetCompact(number *big.Int) (uint32, bool) {
 func SetCompact(nCompact uint32) (*big.Int, bool, bool) {
 	nSize := nCompact >> 24
 	nWord := new(big.Int)
-	u := new(big.Int)
+	var u *big.Int
 	nCompactInt := big.NewInt(int64(nCompact))
 	// 0x00800000是一个符号位，故nWord仅为后23位
 	lowBits := big.NewInt(0x007fffff)
@@ -99,14 +99,14 @@ func unmarshalPowConfig(input []byte) (*PoWConfig, error) {
 		"defaultTarget": 0,
 		"maxTarget":     0,
 	}
-	for k, _ := range int32Map {
+	for k := range int32Map {
 		value, err := strconv.ParseInt(consCfg[k].(string), 10, 32)
 		if err != nil {
 			return nil, fmt.Errorf("marshal consensus config failed key %s set error", k)
 		}
 		int32Map[k] = int32(value)
 	}
-	for k, _ := range uint32Map {
+	for k := range uint32Map {
 		value, err := strconv.ParseInt(consCfg[k].(string), 10, 64)
 		if err != nil {
 			return nil, fmt.Errorf("marshal consensus config failed key %s set error", k)

bcs/consensus/pow/pow.go

@@ -219,7 +219,7 @@ func (pow *PoWConsensus) CheckMinerMatch(ctx xcontext.XContext, block context.Bl
 	}
 	// 跟address比较
 	chkResult, _ := pow.Crypto.VerifyAddressUsingPublicKey(string(block.GetProposer()), k)
-	if chkResult == false {
+	if !chkResult {
 		ctx.GetLog().Warn("PoW::CheckMinerMatch::address is not match publickey", "miner", string(block.GetProposer()))
 		return false, err
 	}
@@ -245,7 +245,8 @@ func (pow *PoWConsensus) ProcessBeforeMiner(height, timestamp int64) ([]byte, []
 	}
 	bits, err := pow.refreshDifficulty(preBlock.GetBlockid(), tipHeight+1)
 	if err != nil {
-		pow.Stop()
+		// TODO: deal with error
+		 _ = pow.Stop()
 	}
 	pow.targetBits = bits
 	store := &PoWStorage{
@@ -409,10 +410,7 @@ func (pow *PoWConsensus) IsProofed(blockID []byte, targetBits uint32) bool {
 	// 原xuperchain逻辑
 	target := big.NewInt(1)
 	target.Lsh(target, uint(256-targetBits))
-	if hash.Cmp(target) == 1 {
-		return false
-	}
-	return true
+	return hash.Cmp(target) != 1
 }
 
 // mining 为带副作用的函数，将直接对block进行操作，更改其原始值
@@ -440,14 +438,16 @@ func (pow *PoWConsensus) mining(task *mineTask) {
 			return
 		}
 		if pow.IsProofed(bid, pow.targetBits) {
-			task.block.SetItem("blockid", bid)
+			// TODO: deal with error
+			_ = task.block.SetItem("blockid", bid)
 			// 签名重置
 			s, err := pow.Crypto.SignECDSA(pow.Address.PrivateKey, bid)
 			if err != nil {
 				task.doDone(BlockSignErr)
 				return
 			}
-			task.block.SetItem("sign", s)
+			// TODO: deal with error
+			_ = task.block.SetItem("sign", s)
 			task.doDone(nil)
 			return
 		}

bcs/consensus/pow/pow_test.go

@@ -276,8 +276,12 @@ func TestMining(t *testing.T) {
 		return
 	}
 	powC.targetBits = minTarget
-	powC.Start()
-	defer powC.Stop()
+	if err := powC.Start(); err != nil {
+		t.Fatal(err)
+	}
+	defer func() {
+		_ = powC.Stop()
+	}()
 	ps := PoWStorage{
 		TargetBits: minTarget,
 	}
@@ -315,7 +319,7 @@ func TestRefreshDifficulty(t *testing.T) {
 		t.Error("NewBlock error", err)
 		return
 	}
-	l, ok := powC.Ledger.(*kmock.FakeLedger)
+	l := powC.Ledger.(*kmock.FakeLedger)
 	err = l.Put(genesisB)
 	if err != nil {
 		t.Error("TestRefreshDifficulty put genesis err", "err", err)
@@ -409,6 +413,9 @@ func TestCheckMinerMatch(t *testing.T) {
 	}
 	by, _ := json.Marshal(ps)
 	b3, err := bmock.NewBlockWithStorage(3, cCtx.Crypto, cCtx.Address, by)
+	if err != nil {
+		t.Fatal(err)
+	}
 	c := cCtx.BaseCtx
 	_, err = i.CheckMinerMatch(&c, b3)
 	if err != nil {
@@ -423,5 +430,7 @@ func TestCompeteMaster(t *testing.T) {
 		return
 	}
 	i := NewPoWConsensus(*cCtx, getConsensusConf(getPoWConsensusConf()))
-	i.CompeteMaster(3)
+	if _, _, err := i.CompeteMaster(3); err != nil {
+		t.Fatal(err)
+	}
 }

bcs/consensus/single/single.go

@@ -110,7 +110,7 @@ func (s *SingleConsensus) CheckMinerMatch(ctx xcontext.XContext, block cctx.Bloc
 		return false, err
 	}
 	chkResult, _ := s.ctx.Crypto.VerifyAddressUsingPublicKey(string(block.GetProposer()), k)
-	if chkResult == false {
+	if !chkResult {
 		ctx.GetLog().Warn("Single::CheckMinerMatch::address is not match publickey")
 		return false, err
 	}

bcs/consensus/single/single_test.go

@@ -62,9 +62,15 @@ func TestNewSingleConsensus(t *testing.T) {
 	if i := NewSingleConsensus(*cCtx, getWrongConsensusConf()); i != nil {
 		t.Error("NewSingleConsensus check name error")
 	}
-	i.Stop()
-	i.Start()
-	i.ProcessBeforeMiner(0, time.Now().UnixNano())
+	if err := i.Stop(); err != nil {
+		t.Fatal(err)
+	}
+	if err := i.Start(); err != nil {
+		t.Fatal(err)
+	}
+	if _, _, err := i.ProcessBeforeMiner(0, time.Now().UnixNano()); err != nil {
+		t.Fatal(err)
+	}
 	cCtx.XLog = nil
 	i = NewSingleConsensus(*cCtx, conf)
 	if i != nil {

bcs/consensus/tdpos/common.go

@@ -114,7 +114,7 @@ func buildConfigs(input []byte) (*tdposConfig, error) {
 		"block_num":          0,
 		"timestamp":          0,
 	}
-	for k, _ := range int64Map {
+	for k := range int64Map {
 		if _, ok := consCfg[k]; !ok {
 			if k == "version" {
 				continue

bcs/consensus/tdpos/kernel_contract.go

@@ -364,7 +364,7 @@ func (tp *tdposConsensus) runGetTdposInfos(contractCtx contract.KContext) (*cont
 
 	// vote信息
 	voteMap := make(map[string]voteValue)
-	for candidate, _ := range nominateValue {
+	for candidate := range nominateValue {
 		// 读取投票存储
 		voteKey := fmt.Sprintf("%s_%d_%s%s", tp.status.Name, tp.status.Version, voteKeyPrefix, candidate)
 		res, err = contractCtx.Get(tp.election.bindContractBucket, []byte(voteKey))

bcs/consensus/tdpos/kernel_contract_test.go

@@ -80,10 +80,10 @@ func TestRunNominateCandidate(t *testing.T) {
 	}
 	// 1. 构造term存储
 	l, _ := cCtx.Ledger.(*kmock.FakeLedger)
-	l.Put(kmock.NewBlock(3))
-	l.Put(kmock.NewBlock(4))
-	l.Put(kmock.NewBlock(5))
-	l.Put(kmock.NewBlock(6))
+	_ = l.Put(kmock.NewBlock(3))
+	_ = l.Put(kmock.NewBlock(4))
+	_ = l.Put(kmock.NewBlock(5))
+	_ = l.Put(kmock.NewBlock(6))
 	// 2. 整理Block的共识存储
 	l.SetConsensusStorage(1, SetTdposStorage(1, nil))
 	l.SetConsensusStorage(2, SetTdposStorage(1, nil))
@@ -116,10 +116,10 @@ func TestRunRevokeCandidate(t *testing.T) {
 	}
 	// 1. 构造term存储
 	l, _ := cCtx.Ledger.(*kmock.FakeLedger)
-	l.Put(kmock.NewBlock(3))
-	l.Put(kmock.NewBlock(4))
-	l.Put(kmock.NewBlock(5))
-	l.Put(kmock.NewBlock(6))
+	_ = l.Put(kmock.NewBlock(3))
+	_ = l.Put(kmock.NewBlock(4))
+	_ = l.Put(kmock.NewBlock(5))
+	_ = l.Put(kmock.NewBlock(6))
 	// 2. 整理Block的共识存储
 	l.SetConsensusStorage(1, SetTdposStorage(1, nil))
 	l.SetConsensusStorage(2, SetTdposStorage(1, nil))
@@ -137,7 +137,9 @@ func TestRunRevokeCandidate(t *testing.T) {
 	i := NewTdposConsensus(*cCtx, getConfig(getTdposConsensusConf()))
 	tdpos, _ := i.(*tdposConsensus)
 	fakeCtx := mock.NewFakeKContext(NewRevokeNominateArgs(), NewM())
-	tdpos.runRevokeCandidate(fakeCtx)
+	if _, err := tdpos.runRevokeCandidate(fakeCtx); err != nil {
+		t.Fatal(err)
+	}
 }
 
 func TestRunVote(t *testing.T) {
@@ -148,10 +150,10 @@ func TestRunVote(t *testing.T) {
 	}
 	// 1. 构造term存储
 	l, _ := cCtx.Ledger.(*kmock.FakeLedger)
-	l.Put(kmock.NewBlock(3))
-	l.Put(kmock.NewBlock(4))
-	l.Put(kmock.NewBlock(5))
-	l.Put(kmock.NewBlock(6))
+	_ = l.Put(kmock.NewBlock(3))
+	_ = l.Put(kmock.NewBlock(4))
+	_ = l.Put(kmock.NewBlock(5))
+	_ = l.Put(kmock.NewBlock(6))
 	// 2. 整理Block的共识存储
 	l.SetConsensusStorage(1, SetTdposStorage(1, nil))
 	l.SetConsensusStorage(2, SetTdposStorage(1, nil))
@@ -169,7 +171,10 @@ func TestRunVote(t *testing.T) {
 	i := NewTdposConsensus(*cCtx, getConfig(getTdposConsensusConf()))
 	tdpos, _ := i.(*tdposConsensus)
 	fakeCtx := mock.NewFakeKContext(NewVoteArgs(), NewM())
-	tdpos.runVote(fakeCtx)
+	_, err = tdpos.runVote(fakeCtx)
+	if err != nil {
+		t.Fatal(err)
+	}
 }
 func TestRunRevokeVote(t *testing.T) {
 	cCtx, err := prepare(getTdposConsensusConf())
@@ -178,11 +183,11 @@ func TestRunRevokeVote(t *testing.T) {
 		return
 	}
 	// 1. 构造term存储
-	l, _ := cCtx.Ledger.(*kmock.FakeLedger)
-	l.Put(kmock.NewBlock(3))
-	l.Put(kmock.NewBlock(4))
-	l.Put(kmock.NewBlock(5))
-	l.Put(kmock.NewBlock(6))
+	l := cCtx.Ledger.(*kmock.FakeLedger)
+	_ = l.Put(kmock.NewBlock(3))
+	_ = l.Put(kmock.NewBlock(4))
+	_ = l.Put(kmock.NewBlock(5))
+	_ = l.Put(kmock.NewBlock(6))
 	// 2. 整理Block的共识存储
 	l.SetConsensusStorage(1, SetTdposStorage(1, nil))
 	l.SetConsensusStorage(2, SetTdposStorage(1, nil))
@@ -200,5 +205,7 @@ func TestRunRevokeVote(t *testing.T) {
 	i := NewTdposConsensus(*cCtx, getConfig(getTdposConsensusConf()))
 	tdpos, _ := i.(*tdposConsensus)
 	fakeCtx := mock.NewFakeKContext(NewNominateArgs(), NewM())
-	tdpos.runRevokeVote(fakeCtx)
+	if _, err := tdpos.runRevokeVote(fakeCtx); err != nil {
+		t.Fatal(err)
+	}
 }

bcs/consensus/tdpos/schedule.go

@@ -259,7 +259,7 @@ func (s *tdposSchedule) calTopKNominator(height int64) ([]string, error) {
 		return nil, err
 	}
 	var termBallotSli termBallotsSlice
-	for candidate, _ := range nominateValue {
+	for candidate := range nominateValue {
 		candidateBallot := &termBallots{
 			Address: candidate,
 		}