aboutsummaryrefslogtreecommitdiffstats
path: root/miner
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2015-09-14 15:35:57 +0800
committerFelix Lange <fjl@twurst.com>2015-09-15 05:36:30 +0800
commit8c4dab77ba48dc68073fe1df79e7000043c0f966 (patch)
tree09ebb0fdb1b72e49ea2cfb9ebdc55a73a174302a /miner
parent55ed8d108d72d12543ecdc6d8c9d9978392dabf0 (diff)
downloaddexon-8c4dab77ba48dc68073fe1df79e7000043c0f966.tar.gz
dexon-8c4dab77ba48dc68073fe1df79e7000043c0f966.tar.zst
dexon-8c4dab77ba48dc68073fe1df79e7000043c0f966.zip
all: move common.Database to package ethdb
Diffstat (limited to 'miner')
-rw-r--r--miner/agent.go5
-rw-r--r--miner/worker.go3
2 files changed, 5 insertions, 3 deletions
diff --git a/miner/agent.go b/miner/agent.go
index 7ccf8d2e0..e80b222c8 100644
--- a/miner/agent.go
+++ b/miner/agent.go
@@ -19,11 +19,12 @@ package miner
import (
"sync"
+ "sync/atomic"
+
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/pow"
- "sync/atomic"
)
type CpuAgent struct {
@@ -63,7 +64,7 @@ func (self *CpuAgent) Stop() {
func (self *CpuAgent) Start() {
self.mu.Lock()
defer self.mu.Unlock()
-
+
if !atomic.CompareAndSwapInt32(&self.isMining, 0, 1) {
return // agent already started
}
diff --git a/miner/worker.go b/miner/worker.go
index 2f43b110f..96c42c292 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -29,6 +29,7 @@ import (
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
@@ -100,7 +101,7 @@ type worker struct {
eth core.Backend
chain *core.ChainManager
proc *core.BlockProcessor
- chainDb common.Database
+ chainDb ethdb.Database
coinbase common.Address
gasPrice *big.Int