aboutsummaryrefslogtreecommitdiff
path: root/miner
diff options
context:
space:
mode:
authorDeterminant <[email protected]>2020-07-30 14:18:44 -0400
committerDeterminant <[email protected]>2020-07-30 14:18:44 -0400
commit0444e66f640999c15496066637841efcc0433934 (patch)
treec19aec2dced2e9129c880c19c52ca0f87b3d62f6 /miner
parentcffa0954bbdb43821d1b71d00f99fb705cecd25b (diff)
parent1f49826de2bb8bb4f5f99f69fd2beb039b1172d9 (diff)
Merge branch 'multi-coin'
Diffstat (limited to 'miner')
-rw-r--r--miner/miner.go13
-rw-r--r--miner/unconfirmed.go2
-rw-r--r--miner/worker.go10
3 files changed, 12 insertions, 13 deletions
diff --git a/miner/miner.go b/miner/miner.go
index ab9b37f..3edbd80 100644
--- a/miner/miner.go
+++ b/miner/miner.go
@@ -22,15 +22,14 @@ import (
"math/big"
"time"
+ "github.com/ava-labs/coreth/consensus"
"github.com/ava-labs/coreth/core"
- myparams "github.com/ava-labs/coreth/params"
+ "github.com/ava-labs/coreth/core/state"
+ "github.com/ava-labs/coreth/core/types"
+ "github.com/ava-labs/coreth/params"
"github.com/ava-labs/go-ethereum/common"
"github.com/ava-labs/go-ethereum/common/hexutil"
- "github.com/ava-labs/go-ethereum/consensus"
- "github.com/ava-labs/go-ethereum/core/state"
- "github.com/ava-labs/go-ethereum/core/types"
"github.com/ava-labs/go-ethereum/event"
- "github.com/ava-labs/go-ethereum/params"
)
// Backend wraps all methods required for mining.
@@ -81,8 +80,8 @@ func (self *Miner) HashRate() uint64 {
}
func (self *Miner) SetExtra(extra []byte) error {
- if uint64(len(extra)) > myparams.MaximumExtraDataSize {
- return fmt.Errorf("Extra exceeds max length. %d > %v", len(extra), myparams.MaximumExtraDataSize)
+ if uint64(len(extra)) > params.MaximumExtraDataSize {
+ return fmt.Errorf("Extra exceeds max length. %d > %v", len(extra), params.MaximumExtraDataSize)
}
self.w.setExtra(extra)
return nil
diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go
index 7e3c6a2..1b8868b 100644
--- a/miner/unconfirmed.go
+++ b/miner/unconfirmed.go
@@ -20,8 +20,8 @@ import (
"container/ring"
"sync"
+ "github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/go-ethereum/common"
- "github.com/ava-labs/go-ethereum/core/types"
"github.com/ava-labs/go-ethereum/log"
)
diff --git a/miner/worker.go b/miner/worker.go
index df1c601..feab0b2 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -27,15 +27,15 @@ import (
"sync/atomic"
"time"
+ "github.com/ava-labs/coreth/consensus"
+ "github.com/ava-labs/coreth/consensus/misc"
"github.com/ava-labs/coreth/core"
+ "github.com/ava-labs/coreth/core/state"
+ "github.com/ava-labs/coreth/core/types"
+ "github.com/ava-labs/coreth/params"
"github.com/ava-labs/go-ethereum/common"
- "github.com/ava-labs/go-ethereum/consensus"
- "github.com/ava-labs/go-ethereum/consensus/misc"
- "github.com/ava-labs/go-ethereum/core/state"
- "github.com/ava-labs/go-ethereum/core/types"
"github.com/ava-labs/go-ethereum/event"
"github.com/ava-labs/go-ethereum/log"
- "github.com/ava-labs/go-ethereum/params"
mapset "github.com/deckarep/golang-set"
)