Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-07-03 03:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the stopOldTemplateSolving channel in the miner getting closed twice (#1286)

Browse Source 
* Fix the stopOldTemplateSolving channel in the miner getting closed twice.

* Remove a unused variable.
This commit is contained in:
stasatdaglabs 2020-12-24 17:58:28 +02:00 committed by GitHub
parent 830ddf4735
commit 0dea766373
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/kaspaminer/mineloop.go
View File

@ -89,7 +89,7 @@ func mineNextBlock(client *minerClient, miningAddr util.Address, foundBlock chan
templatesLoop(client, miningAddr, newTemplateChan, errChan, templateStopChan) templatesLoop(client, miningAddr, newTemplateChan, errChan, templateStopChan)
}) })
spawn("solveLoop", func() { spawn("solveLoop", func() {
solveLoop(newTemplateChan, foundBlock, mineWhenNotSynced, errChan) solveLoop(newTemplateChan, foundBlock, mineWhenNotSynced)
}) })
} }
@ -151,18 +151,19 @@ func templatesLoop(client *minerClient, miningAddr util.Address,
} }
func solveLoop(newTemplateChan chan *appmessage.GetBlockTemplateResponseMessage, foundBlock chan *externalapi.DomainBlock, func solveLoop(newTemplateChan chan *appmessage.GetBlockTemplateResponseMessage, foundBlock chan *externalapi.DomainBlock,
mineWhenNotSynced bool, errChan chan error) { mineWhenNotSynced bool) {
var stopOldTemplateSolving chan struct{} var stopOldTemplateSolving chan struct{}
for template := range newTemplateChan { for template := range newTemplateChan {
if stopOldTemplateSolving != nil {
close(stopOldTemplateSolving)
}
if !template.IsSynced && !mineWhenNotSynced { if !template.IsSynced && !mineWhenNotSynced {
log.Warnf("Kaspad is not synced. Skipping current block template") log.Warnf("Kaspad is not synced. Skipping current block template")
continue continue
} }
if stopOldTemplateSolving != nil {
close(stopOldTemplateSolving)
}
stopOldTemplateSolving = make(chan struct{}) stopOldTemplateSolving = make(chan struct{})
block := appmessage.MsgBlockToDomainBlock(template.MsgBlock) block := appmessage.MsgBlockToDomainBlock(template.MsgBlock)