Skip to content

Commit

Permalink
eth: golint updates for this or self warning (ethereum#16632)
Browse files Browse the repository at this point in the history
* eth/*:golint updates for this or self warning

* eth/*: golint updates for this or self warning, pr updated per feedback
  • Loading branch information
kielbarry authored and mariameda committed Aug 19, 2018
1 parent bac9cfb commit 3fb6354
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
12 changes: 6 additions & 6 deletions eth/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -326,13 +326,13 @@ func (s *Ethereum) Etherbase() (eb common.Address, err error) {
return common.Address{}, fmt.Errorf("etherbase must be explicitly specified")
}

// set in js console via admin interface or wrapper from cli flags
func (self *Ethereum) SetEtherbase(etherbase common.Address) {
self.lock.Lock()
self.etherbase = etherbase
self.lock.Unlock()
// SetEtherbase sets the mining reward address.
func (s *Ethereum) SetEtherbase(etherbase common.Address) {
s.lock.Lock()
s.etherbase = etherbase
s.lock.Unlock()

self.miner.SetEtherbase(etherbase)
s.miner.SetEtherbase(etherbase)
}

func (s *Ethereum) StartMining(local bool) error {
Expand Down
28 changes: 14 additions & 14 deletions eth/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -725,25 +725,25 @@ func (pm *ProtocolManager) BroadcastTx(hash common.Hash, tx *types.Transaction)
}

// Mined broadcast loop
func (self *ProtocolManager) minedBroadcastLoop() {
func (pm *ProtocolManager) minedBroadcastLoop() {
// automatically stops if unsubscribe
for obj := range self.minedBlockSub.Chan() {
for obj := range pm.minedBlockSub.Chan() {
switch ev := obj.Data.(type) {
case core.NewMinedBlockEvent:
self.BroadcastBlock(ev.Block, true) // First propagate block to peers
self.BroadcastBlock(ev.Block, false) // Only then announce to the rest
pm.BroadcastBlock(ev.Block, true) // First propagate block to peers
pm.BroadcastBlock(ev.Block, false) // Only then announce to the rest
}
}
}

func (self *ProtocolManager) txBroadcastLoop() {
func (pm *ProtocolManager) txBroadcastLoop() {
for {
select {
case event := <-self.txCh:
self.BroadcastTx(event.Tx.Hash(), event.Tx)
case event := <-pm.txCh:
pm.BroadcastTx(event.Tx.Hash(), event.Tx)

// Err() channel will be closed when unsubscribing.
case <-self.txSub.Err():
case <-pm.txSub.Err():
return
}
}
Expand All @@ -760,13 +760,13 @@ type NodeInfo struct {
}

// NodeInfo retrieves some protocol metadata about the running host node.
func (self *ProtocolManager) NodeInfo() *NodeInfo {
currentBlock := self.blockchain.CurrentBlock()
func (pm *ProtocolManager) NodeInfo() *NodeInfo {
currentBlock := pm.blockchain.CurrentBlock()
return &NodeInfo{
Network: self.networkId,
Difficulty: self.blockchain.GetTd(currentBlock.Hash(), currentBlock.NumberU64()),
Genesis: self.blockchain.Genesis().Hash(),
Config: self.blockchain.Config(),
Network: pm.networkId,
Difficulty: pm.blockchain.GetTd(currentBlock.Hash(), currentBlock.NumberU64()),
Genesis: pm.blockchain.Genesis().Hash(),
Config: pm.blockchain.Config(),
Head: currentBlock.Hash(),
}
}

0 comments on commit 3fb6354

Please sign in to comment.