diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-01 03:52:57 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-01 03:52:57 +0800 |
| commit | 73c52d1677ba526385f1b223ef48f3a26091fe00 (patch) | |
| tree | b7414552192d8e7520a2df8353677a5f19231866 /eth/backend.go | |
| parent | ae45a39dc1cddac885090872cefc6799b4a4c1d9 (diff) | |
| parent | c18ea4de147cb81bf5563a5727172d4103658b92 (diff) | |
| download | go-tangerine-73c52d1677ba526385f1b223ef48f3a26091fe00.tar go-tangerine-73c52d1677ba526385f1b223ef48f3a26091fe00.tar.gz go-tangerine-73c52d1677ba526385f1b223ef48f3a26091fe00.tar.bz2 go-tangerine-73c52d1677ba526385f1b223ef48f3a26091fe00.tar.lz go-tangerine-73c52d1677ba526385f1b223ef48f3a26091fe00.tar.xz go-tangerine-73c52d1677ba526385f1b223ef48f3a26091fe00.tar.zst go-tangerine-73c52d1677ba526385f1b223ef48f3a26091fe00.zip | |
Merge branch 'ethersphere-blockpool2' into poc-9
Diffstat (limited to 'eth/backend.go')
| -rw-r--r-- | eth/backend.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/eth/backend.go b/eth/backend.go index f67f9c78b..0de0fcf4a 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -7,6 +7,7 @@ import ( "path" "strings" + "github.com/ethereum/go-ethereum/blockpool" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" @@ -117,7 +118,7 @@ type Ethereum struct { blockProcessor *core.BlockProcessor txPool *core.TxPool chainManager *core.ChainManager - blockPool *BlockPool + blockPool *blockpool.BlockPool whisper *whisper.Whisper net *p2p.Server @@ -186,7 +187,7 @@ func New(config *Config) (*Ethereum, error) { hasBlock := eth.chainManager.HasBlock insertChain := eth.chainManager.InsertChain - eth.blockPool = NewBlockPool(hasBlock, insertChain, ezp.Verify) + eth.blockPool = blockpool.New(hasBlock, insertChain, ezp.Verify) netprv, err := config.nodeKey() if err != nil { @@ -221,7 +222,7 @@ func (s *Ethereum) Name() string { return s.net.Name } func (s *Ethereum) ChainManager() *core.ChainManager { return s.chainManager } func (s *Ethereum) BlockProcessor() *core.BlockProcessor { return s.blockProcessor } func (s *Ethereum) TxPool() *core.TxPool { return s.txPool } -func (s *Ethereum) BlockPool() *BlockPool { return s.blockPool } +func (s *Ethereum) BlockPool() *blockpool.BlockPool { return s.blockPool } func (s *Ethereum) Whisper() *whisper.Whisper { return s.whisper } func (s *Ethereum) EventMux() *event.TypeMux { return s.eventMux } func (s *Ethereum) Db() ethutil.Database { return s.db } |