Merge pull request #656 from vipwzw/fix_tick_time

plugin/consensus/ticket/testdata/chain33.cfg.toml

@@ -2,6 +2,7 @@ Title="local"
 TestNet=true
 FixTime=false
 
+
 [log]
 # 日志级别，支持debug(dbug)/info/warn/error(eror)/crit
 loglevel = "debug"
@@ -82,7 +83,7 @@ maxTxNumber = 1600
 maxTxNumber = 10000
 
 [mver.consensus.ForkChainParamV2]
-powLimitBits = "0x1f2fffff"
+powLimitBits = "0x2f2fffff"
 
 [mver.consensus.ForkTicketFundAddrV1]
 fundKeyAddr = "1Ji3W12KGScCM7C2p8bg635sNkayDM8MGY"
@@ -113,7 +114,7 @@ genesisBlockTime=1514533394
 [[consensus.sub.ticket.genesis]]
 minerAddr="12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 returnAddr="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
-count=10000
+count=3000
 
 [[consensus.sub.ticket.genesis]]
 minerAddr="1PUiGcbsccfxW3zuvHXZBJfznziph5miAo"
@@ -185,4 +186,4 @@ superManager=[
 
 [exec.sub.autonomy]
 total="16htvcBNSEA7fZhAdLJphDwQRQJaHpyHTp"
-useBalance=false
+useBalance=false
\ No newline at end of file

plugin/consensus/ticket/ticket_test.go

@@ -8,6 +8,7 @@ import (
 	"crypto/ecdsa"
 	"fmt"
 	"testing"
+	"time"
 
 	"github.com/33cn/chain33/account"
 	"github.com/33cn/chain33/common/crypto"
@@ -68,20 +69,28 @@ func testTicket(t *testing.T) {
 	status, err = mock33.GetAPI().GetWalletStatus()
 	assert.Nil(t, err)
 	assert.Equal(t, true, status.IsAutoMining)
-	err = mock33.WaitHeight(50)
-	assert.Nil(t, err)
-	//查询票是否自动close，并且购买了新的票
-	req := &types.ReqWalletTransactionList{Count: 1000}
-	list, err := mock33.GetAPI().WalletTransactionList(req)
-	assert.Nil(t, err)
+	start := time.Now()
+	height := int64(0)
 	hastclose := false
 	hastopen := false
-	for _, tx := range list.TxDetails {
-		if tx.ActionName == "tclose" && tx.Receipt.Ty == 2 {
-			hastclose = true
+	for {
+		height += 20
+		err = mock33.WaitHeight(height)
+		assert.Nil(t, err)
+		//查询票是否自动close，并且购买了新的票
+		req := &types.ReqWalletTransactionList{Count: 1000}
+		list, err := mock33.GetAPI().WalletTransactionList(req)
+		assert.Nil(t, err)
+		for _, tx := range list.TxDetails {
+			if tx.ActionName == "tclose" && tx.Receipt.Ty == 2 {
+				hastclose = true
+			}
+			if tx.ActionName == "topen" && tx.Receipt.Ty == 2 {
+				hastopen = true
+			}
 		}
-		if tx.ActionName == "topen" && tx.Receipt.Ty == 2 {
-			hastopen = true
+		if hastopen == true && hastclose == true || time.Since(start) > 100*time.Second {
+			break
 		}
 	}
 	assert.Equal(t, true, hastclose)