Skip to content

P
plugin
Commit 1707a867 authored by vipwzw's avatar vipwzw
Browse files
Options

merge from develop

parents d23ab9a1 dd2d5d67
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
plugin/consensus/ticket/testdata/chain33.cfg.toml
View file @ 1707a867
...@@ -2,7 +2,6 @@ Title="local" ...@@ -2,7 +2,6 @@ Title="local"
TestNet=true TestNet=true
FixTime=false FixTime=false
[log] [log]
# 日志级别，支持debug(dbug)/info/warn/error(eror)/crit # 日志级别，支持debug(dbug)/info/warn/error(eror)/crit
loglevel = "debug" loglevel = "debug"
...@@ -172,4 +171,4 @@ superManager=[ ...@@ -172,4 +171,4 @@ superManager=[
"1Bsg9j6gW83sShoee1fZAt9TkUjcrCgA9S", "1Bsg9j6gW83sShoee1fZAt9TkUjcrCgA9S",
"12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv", "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv",
"1Q8hGLfoGe63efeWa8fJ4Pnukhkngt6poK" "1Q8hGLfoGe63efeWa8fJ4Pnukhkngt6poK"
] ]
\ No newline at end of file
plugin/consensus/ticket/ticket_test.go
View file @ 1707a867
...@@ -10,6 +10,7 @@ import ( ...@@ -10,6 +10,7 @@ import (
"github.com/33cn/chain33/account" "github.com/33cn/chain33/account"
"github.com/33cn/chain33/common/crypto" "github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/queue"
_ "github.com/33cn/chain33/system" _ "github.com/33cn/chain33/system"
"github.com/33cn/chain33/types" "github.com/33cn/chain33/types"
"github.com/33cn/chain33/util" "github.com/33cn/chain33/util"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment