merge from develop

1707a867 · vipwzw · d23ab9a1 · dd2d5d67 · 1707a867 · 1707a867
Commit 1707a867 authored Nov 26, 2018 by vipwzw
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

chain33.cfg.toml plugin/consensus/ticket/testdata/chain33.cfg.toml +0 -1

ticket_test.go plugin/consensus/ticket/ticket_test.go +1 -0

No files found.
--- a/plugin/consensus/ticket/testdata/chain33.cfg.toml
+++ b/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"

--- a/plugin/consensus/ticket/ticket_test.go
+++ b/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"