multi: add cpuminerConfig. #1423
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dnldd
force-pushed
the
cpu_miner_cfg
branch
2 times, most recently
from
db548a3 to
c3fd242
Compare
dnldd
force-pushed
the
cpu_miner_cfg
branch
2 times, most recently
from
83a8b67 to
98dd3f3
Compare
davecgh
requested changes
Sep 13, 2018
cpuminer.go
Outdated
| // g identifies the instance to use in order to generate | ||
| // block templates that the miner will attempt to solve. | ||
| g *BlkTmplGenerator | ||
| // ProcessBlock defines the function to call with any solved blocks. |
There was a problem hiding this comment.
Needs blank line before for consistency. Same with the others.
cpuminer.go
Outdated
| type cpuminerConfig struct { | ||
| // g identifies the instance to use in order to generate | ||
| // block templates that the miner will attempt to solve. | ||
| g *BlkTmplGenerator |
There was a problem hiding this comment.
Please match the upstream commit. It will need to be exported to be able to be set from another package once it's moved to its own and it should be named BlockTemplateGenerator.
Also, this struct should have ChainParams as the first field, just like upstream, because, once again, they will need to be provided to the package in question when it's separated.
I see that it is missing MiningAddrs too.
cpuminer.go
Outdated
| @@ -151,7 +175,7 @@ func (m *CPUMiner) submitBlock(block *dcrutil.Block) bool { | |||
| // Occasionally errors are given out for timing errors with | |||
| // ReduceMinDifficulty and high block works that is above | |||
| // the target. Feed these to debug. | |||
| if m.server.chainParams.ReduceMinDifficulty && | |||
| if m.cfg.g.chainParams.ReduceMinDifficulty && | |||
cpuminer.go
Outdated
| @@ -138,7 +162,7 @@ func (m *CPUMiner) submitBlock(block *dcrutil.Block) bool { | |||
|
|
|||
| // Process this block using the same rules as blocks coming from other | |||
| // nodes. This will in turn relay it to the network like normal. | |||
| isOrphan, err := m.server.blockManager.ProcessBlock(block, blockchain.BFNone) | |||
| isOrphan, err := m.cfg.g.blockManager.ProcessBlock(block, blockchain.BFNone) | |||
cpuminer.go
Outdated
| @@ -64,8 +89,7 @@ var ( | |||
| // system which is typically sufficient. | |||
| type CPUMiner struct { | |||
| sync.Mutex | |||
| g *BlkTmplGenerator | |||
There was a problem hiding this comment.
This should be retained and just set to cfg.BlockTemplateGenerator in newCPUMiner just like upstream.
cpuminer.go
Outdated
| @@ -546,10 +570,10 @@ func (m *CPUMiner) GenerateNBlocks(n uint32) ([]*chainhash.Hash, error) { | |||
| m.Lock() | |||
|
|
|||
| // Respond with an error if there's virtually 0 chance of CPU-mining a block. | |||
| if !m.server.chainParams.GenerateSupported { | |||
| if !m.cfg.g.chainParams.GenerateSupported { | |||
cpuminer.go
Outdated
| @@ -600,7 +624,7 @@ func (m *CPUMiner) GenerateNBlocks(n uint32) ([]*chainhash.Hash, error) { | |||
| // Create a new block template using the available transactions | |||
| // in the memory pool as a source of transactions to potentially | |||
| // include in the block. | |||
| template, err := m.g.NewBlockTemplate(payToAddr) | |||
| template, err := m.cfg.g.NewBlockTemplate(payToAddr) | |||
There was a problem hiding this comment.
No need to change this from m.g.NewBlockTempate once the other comments are addressed.
cpuminer.go
Outdated
| now.After(lastGenerated.Add(3*time.Second))) || | ||
| now.After(lastGenerated.Add(60*time.Second)) { | ||
| return false | ||
| } | ||
|
|
||
| err = UpdateBlockTime(msgBlock, m.server.blockManager) | ||
| err = UpdateBlockTime(msgBlock, m.cfg.g.blockManager) |
There was a problem hiding this comment.
It seems like there needs to be another preliminary commit before this one to remove the rest of the dependencies on the block manager. Notice how the upstream commit by this point no longer needs a reference to it and that is intentional.
cpuminer.go
Outdated
| @@ -303,7 +327,7 @@ out: | |||
| // Hacks to make dcr work with Decred PoC (simnet only) | |||
| // TODO Remove before production. | |||
| if cfg.SimNet { | |||
| curHeight := m.server.blockManager.chain.BestSnapshot().Height | |||
| curHeight := m.cfg.g.chain.BestSnapshot().Height | |||
cpuminer.go
Outdated
| m.Unlock() | ||
| return nil, errors.New("no support for `generate` on the current " + | ||
| "network, " + m.server.chainParams.Net.String() + | ||
| "network, " + m.cfg.g.chainParams.Net.String() + |
dnldd
force-pushed
the
cpu_miner_cfg
branch
from
98dd3f3 to
2dd9cc5
Compare
davecgh
requested changes
Sep 13, 2018
dnldd
force-pushed
the
cpu_miner_cfg
branch
2 times, most recently
from
4056595 to
19357a4
Compare
dnldd
force-pushed
the
cpu_miner_cfg
branch
from
19357a4 to
817373d
Compare
Port of upstream commit 6719014.
dnldd
force-pushed
the
cpu_miner_cfg
branch
from
05b4bc7 to
6113b72
Compare
davecgh
approved these changes
Sep 13, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR requires #1417, #1418, #1419, #1420, #1421 and #1422
Port of upstream commit 6719014.