merge from develop

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

@@ -2,7 +2,6 @@ Title="local"
 TestNet=true
 FixTime=false
 
-
 [log]
 # 日志级别，支持debug(dbug)/info/warn/error(eror)/crit
 loglevel = "debug"
@@ -172,4 +171,4 @@ superManager=[
     "1Bsg9j6gW83sShoee1fZAt9TkUjcrCgA9S", 
     "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv", 
     "1Q8hGLfoGe63efeWa8fJ4Pnukhkngt6poK"
-]
\ No newline at end of file
+]

plugin/consensus/ticket/ticket_test.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/33cn/chain33/account"
 	"github.com/33cn/chain33/common/crypto"
+	"github.com/33cn/chain33/queue"
 	_ "github.com/33cn/chain33/system"
 	"github.com/33cn/chain33/types"
 	"github.com/33cn/chain33/util"