Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
0029a869
Commit
0029a869
authored
Jun 05, 2018
by
Mark
Committed by
Felix Lange
Jun 05, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
miner: not call commitNewWork if it's a side block (#16751)
parent
400332b9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
10 deletions
+0
-10
worker.go
miner/worker.go
+0
-10
No files found.
miner/worker.go
View file @
0029a869
...
...
@@ -297,7 +297,6 @@ func (self *worker) update() {
func
(
self
*
worker
)
wait
()
{
for
{
mustCommitNewWork
:=
true
for
result
:=
range
self
.
recv
{
atomic
.
AddInt32
(
&
self
.
atWork
,
-
1
)
...
...
@@ -322,11 +321,6 @@ func (self *worker) wait() {
log
.
Error
(
"Failed writing block to chain"
,
"err"
,
err
)
continue
}
// check if canon block and write transactions
if
stat
==
core
.
CanonStatTy
{
// implicit by posting ChainHeadEvent
mustCommitNewWork
=
false
}
// Broadcast the block and announce chain insertion event
self
.
mux
.
Post
(
core
.
NewMinedBlockEvent
{
Block
:
block
})
var
(
...
...
@@ -341,10 +335,6 @@ func (self *worker) wait() {
// Insert the block into the set of pending ones to wait for confirmations
self
.
unconfirmed
.
Insert
(
block
.
NumberU64
(),
block
.
Hash
())
if
mustCommitNewWork
{
self
.
commitNewWork
()
}
}
}
}
...
...
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