gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ethminer => miner

Browse Source
This commit is contained in:
obscuren
2014-10-31 14:56:42 +01:00
parent 4914a78c8c
commit 5af4ff985d
3 changed files with 231 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/mist/gui.go
View File

@ -33,9 +33,9 @@ import (
"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/chain"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/ethminer"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/miner"
"github.com/ethereum/go-ethereum/wire"
"github.com/ethereum/go-ethereum/xeth"
"gopkg.in/qml.v1"
@ -92,7 +92,7 @@ type Gui struct {
plugins map[string]plugin
miner *ethminer.Miner
miner *miner.Miner
stdLog logger.LogSystem
}
@ -410,7 +410,7 @@ func (gui *Gui) update() {
chain.NewBlockEvent{},
chain.TxPreEvent{},
chain.TxPostEvent{},
ethminer.Event{},
miner.Event{},
)
// nameReg := gui.pipe.World().Config().Get("NameReg")
@ -469,8 +469,8 @@ func (gui *Gui) update() {
case eth.PeerListEvent:
gui.setPeerInfo()
case ethminer.Event:
if ev.Type == ethminer.Started {
case miner.Event:
if ev.Type == miner.Started {
gui.miner = ev.Miner
} else {
gui.miner = nil

18
cmd/utils/cmd.go
View File

@ -16,9 +16,9 @@ import (
"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/ethminer"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/miner"
"github.com/ethereum/go-ethereum/rpc"
"github.com/ethereum/go-ethereum/wire"
"github.com/ethereum/go-ethereum/xeth"
@ -252,10 +252,10 @@ func StartRpc(ethereum *eth.Ethereum, RpcPort int) {
}
}
var miner *ethminer.Miner
var gminer *miner.Miner
func GetMiner() *ethminer.Miner {
return miner
func GetMiner() *miner.Miner {
return gminer
}
func StartMining(ethereum *eth.Ethereum) bool {
@ -265,15 +265,15 @@ func StartMining(ethereum *eth.Ethereum) bool {
go func() {
clilogger.Infoln("Start mining")
if miner == nil {
miner = ethminer.NewDefaultMiner(addr, ethereum)
if gminer == nil {
gminer = miner.NewDefaultMiner(addr, ethereum)
}
// Give it some time to connect with peers
time.Sleep(3 * time.Second)
for !ethereum.IsUpToDate() {
time.Sleep(5 * time.Second)
}
miner.Start()
gminer.Start()
}()
RegisterInterrupt(func(os.Signal) {
StopMining(ethereum)
@ -297,8 +297,8 @@ func FormatTransactionData(data string) []byte {
}
func StopMining(ethereum *eth.Ethereum) bool {
if ethereum.Mining && miner != nil {
miner.Stop()
if ethereum.Mining && gminer != nil {
gminer.Stop()
clilogger.Infoln("Stopped mining")
ethereum.Mining = false