Skip to content
This repository has been archived by the owner on Apr 2, 2024. It is now read-only.

Commit

Permalink
refactor(BUX-461): suggestions from PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
chris-4chain committed Jan 12, 2024
1 parent 73ec333 commit 9db6a7d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
7 changes: 3 additions & 4 deletions chainstate/minercraft_default.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ func defaultMinecraftConfig() *minercraftConfig {
broadcastMiners := []*minercraft.Miner{}
queryMiners := []*minercraft.Miner{}
for _, miner := range miners {
currentMiner := *miner
broadcastMiners = append(broadcastMiners, &currentMiner)
broadcastMiners = append(broadcastMiners, miner)

if supportsQuerying(&currentMiner) {
queryMiners = append(queryMiners, &currentMiner)
if supportsQuerying(miner) {
queryMiners = append(queryMiners, miner)
}
}

Expand Down
18 changes: 9 additions & 9 deletions chainstate/minercraft_init.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,24 +56,24 @@ func (i *minercraftInitializer) defaultMinercraftOptions() (opts *minercraft.Cli

func (i *minercraftInitializer) newClient() (err error) {
c := i.client
// No client?

if c.Minercraft() == nil {
var optionalMiners []*minercraft.Miner
var loadedMiners []string

// Loop all broadcast miners and append to the list of miners
for i := range c.options.config.minercraftConfig.broadcastMiners {
if !utils.StringInSlice(c.options.config.minercraftConfig.broadcastMiners[i].MinerID, loadedMiners) {
optionalMiners = append(optionalMiners, c.options.config.minercraftConfig.broadcastMiners[i])
loadedMiners = append(loadedMiners, c.options.config.minercraftConfig.broadcastMiners[i].MinerID)
for _, broadcastMiner := range c.options.config.minercraftConfig.broadcastMiners {
if !utils.StringInSlice(broadcastMiner.MinerID, loadedMiners) {
optionalMiners = append(optionalMiners, broadcastMiner)
loadedMiners = append(loadedMiners, broadcastMiner.MinerID)
}
}

// Loop all query miners and append to the list of miners
for i := range c.options.config.minercraftConfig.queryMiners {
if !utils.StringInSlice(c.options.config.minercraftConfig.queryMiners[i].MinerID, loadedMiners) {
optionalMiners = append(optionalMiners, c.options.config.minercraftConfig.queryMiners[i])
loadedMiners = append(loadedMiners, c.options.config.minercraftConfig.queryMiners[i].MinerID)
for _, queryMiner := range c.options.config.minercraftConfig.queryMiners {
if !utils.StringInSlice(queryMiner.MinerID, loadedMiners) {
optionalMiners = append(optionalMiners, queryMiner)
loadedMiners = append(loadedMiners, queryMiner.MinerID)
}
}
c.options.config.minercraft, err = minercraft.NewClient(
Expand Down

0 comments on commit 9db6a7d

Please sign in to comment.