From d235e2c6a5788ec4a6cff15a16f56b38a3876a0d Mon Sep 17 00:00:00 2001 From: Determinant Date: Sun, 28 Jun 2020 14:47:41 -0400 Subject: ... --- miner/miner.go | 13 ++++++------- miner/unconfirmed.go | 2 +- miner/worker.go | 10 +++++----- 3 files changed, 12 insertions(+), 13 deletions(-) (limited to 'miner') 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" ) -- cgit v1.2.3-70-g09d2