diff options
Diffstat (limited to 'eth/api.go')
| -rw-r--r-- | eth/api.go | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/eth/api.go b/eth/api.go index 3aac34ee0..b17968ebb 100644 --- a/eth/api.go +++ b/eth/api.go @@ -29,7 +29,6 @@ import ( "strings" "time" - "github.com/ethereum/ethash" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core" @@ -40,7 +39,6 @@ import ( "github.com/ethereum/go-ethereum/miner" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" "golang.org/x/net/context" ) @@ -137,7 +135,6 @@ func NewPrivateMinerAPI(e *Ethereum) *PrivateMinerAPI { // Start the miner with the given number of threads. If threads is nil the number of // workers started is equal to the number of logical CPU's that are usable by this process. func (s *PrivateMinerAPI) Start(threads *int) (bool, error) { - s.e.StartAutoDAG() var err error if threads == nil { err = s.e.StartMining(runtime.NumCPU()) @@ -173,25 +170,9 @@ func (s *PrivateMinerAPI) SetEtherbase(etherbase common.Address) bool { return true } -// StartAutoDAG starts auto DAG generation. This will prevent the DAG generating on epoch change -// which will cause the node to stop mining during the generation process. -func (s *PrivateMinerAPI) StartAutoDAG() bool { - s.e.StartAutoDAG() - return true -} - -// StopAutoDAG stops auto DAG generation -func (s *PrivateMinerAPI) StopAutoDAG() bool { - s.e.StopAutoDAG() - return true -} - -// MakeDAG creates the new DAG for the given block number -func (s *PrivateMinerAPI) MakeDAG(blockNr rpc.BlockNumber) (bool, error) { - if err := ethash.MakeDAG(uint64(blockNr.Int64()), ""); err != nil { - return false, err - } - return true, nil +// GetHashrate returns the current hashrate of the miner. +func (s *PrivateMinerAPI) GetHashrate() uint64 { + return uint64(s.e.miner.HashRate()) } // PrivateAdminAPI is the collection of Etheruem full node-related APIs |