diff options
| author | zelig <viktor.tron@gmail.com> | 2015-02-25 21:06:59 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-02-25 21:38:37 +0800 |
| commit | 16ecda951b767800b4e09ad8e86e0866b05136be (patch) | |
| tree | dfb4defb949713c03e05988de1abae5123733cf5 /eth/backend.go | |
| parent | cdc86965cb38335b97d0bef337e0a53ed7c7f7e3 (diff) | |
| download | dexon-16ecda951b767800b4e09ad8e86e0866b05136be.tar.gz dexon-16ecda951b767800b4e09ad8e86e0866b05136be.tar.zst dexon-16ecda951b767800b4e09ad8e86e0866b05136be.zip | |
integrate blockpool into eth
- remove blockpool code
- remove blockpool integration test (kinda embarrassing)
- remove errors.go
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 0e5d24429..f6cde5ccd 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 @@ -185,7 +186,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 { @@ -220,7 +221,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 } |