aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/utils
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-10-31 21:56:42 +0800
committerobscuren <geffobscura@gmail.com>2014-10-31 21:56:42 +0800
commit5af4ff985dc43b648bdc96394a3bd96d9658ae0a (patch)
tree998a0a28f5599b5956a4ac9d55e8569ac12116df /cmd/utils
parent4914a78c8c650d7fc74570f25a682598aaeb6973 (diff)
downloadgo-tangerine-5af4ff985dc43b648bdc96394a3bd96d9658ae0a.tar.gz
go-tangerine-5af4ff985dc43b648bdc96394a3bd96d9658ae0a.tar.zst
go-tangerine-5af4ff985dc43b648bdc96394a3bd96d9658ae0a.zip
ethminer => miner
Diffstat (limited to 'cmd/utils')
-rw-r--r--cmd/utils/cmd.go18
1 files changed, 9 insertions, 9 deletions
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index 5313b8fad..ef2ce8b47 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -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