Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
plugin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
link33
plugin
Commits
9ae1ddb3
Commit
9ae1ddb3
authored
Dec 07, 2018
by
heyubin
Committed by
vipwzw
Dec 07, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add by hyb for issues109
parent
1bc1534a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
7 deletions
+3
-7
ticket.go
plugin/consensus/ticket/ticket.go
+3
-3
ticket.go
plugin/dapp/ticket/wallet/ticket.go
+0
-4
No files found.
plugin/consensus/ticket/ticket.go
View file @
9ae1ddb3
...
@@ -212,12 +212,12 @@ func (client *Client) setTicket(tlist *ty.ReplyTicketList, privmap map[string]cr
...
@@ -212,12 +212,12 @@ func (client *Client) setTicket(tlist *ty.ReplyTicketList, privmap map[string]cr
func
(
client
*
Client
)
flushTicket
()
error
{
func
(
client
*
Client
)
flushTicket
()
error
{
//list accounts
//list accounts
tickets
,
privs
,
err
:=
client
.
getTickets
()
tickets
,
privs
,
err
:=
client
.
getTickets
()
if
err
==
types
.
Err
MinerNotStared
||
err
==
types
.
Err
WalletIsLocked
{
if
err
==
types
.
ErrWalletIsLocked
{
tlog
.
Error
(
"flushTicket error"
,
"err"
,
"wallet
miner not start or wallet
is locked"
)
tlog
.
Error
(
"flushTicket error"
,
"err"
,
"wallet is locked"
)
client
.
setTicket
(
nil
,
nil
)
client
.
setTicket
(
nil
,
nil
)
return
nil
return
nil
}
}
if
err
!=
nil
&&
err
!=
types
.
ErrMinerNotStared
{
if
err
!=
nil
{
tlog
.
Error
(
"flushTicket error"
,
"err"
,
err
)
tlog
.
Error
(
"flushTicket error"
,
"err"
,
err
)
return
err
return
err
}
}
...
...
plugin/dapp/ticket/wallet/ticket.go
View file @
9ae1ddb3
...
@@ -393,14 +393,10 @@ func (policy *ticketPolicy) getTicketsByStatus(status int32) ([]*ty.Ticket, [][]
...
@@ -393,14 +393,10 @@ func (policy *ticketPolicy) getTicketsByStatus(status int32) ([]*ty.Ticket, [][]
}
}
operater
.
GetMutex
()
.
Lock
()
operater
.
GetMutex
()
.
Lock
()
defer
operater
.
GetMutex
()
.
Unlock
()
defer
operater
.
GetMutex
()
.
Unlock
()
ok
,
err
:=
operater
.
CheckWalletStatus
()
ok
,
err
:=
operater
.
CheckWalletStatus
()
if
!
ok
&&
err
!=
types
.
ErrOnlyTicketUnLocked
{
if
!
ok
&&
err
!=
types
.
ErrOnlyTicketUnLocked
{
return
nil
,
nil
,
err
return
nil
,
nil
,
err
}
}
if
!
policy
.
IsAutoMining
()
{
return
nil
,
nil
,
types
.
ErrMinerNotStared
}
//循环遍历所有的账户-->保证钱包已经解锁
//循环遍历所有的账户-->保证钱包已经解锁
var
tickets
[]
*
ty
.
Ticket
var
tickets
[]
*
ty
.
Ticket
var
privs
[][]
byte
var
privs
[][]
byte
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment