aboutsummaryrefslogtreecommitdiffstats
path: root/eth/backend.go
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-04-25 06:56:17 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-04-25 06:56:17 +0800
commit8d09f95bc7a73aaf567b05028ebdb4f2ac5129e4 (patch)
treeff72b1935c12817594466adfa3334e9f23736924 /eth/backend.go
parent7afbd0f20d39ed3957f696f49da8c159735e95d3 (diff)
parented036a2ce7d846297032a803fd7e82a3f84b239a (diff)
downloadgo-tangerine-8d09f95bc7a73aaf567b05028ebdb4f2ac5129e4.tar.gz
go-tangerine-8d09f95bc7a73aaf567b05028ebdb4f2ac5129e4.tar.zst
go-tangerine-8d09f95bc7a73aaf567b05028ebdb4f2ac5129e4.zip
Merge pull request #805 from obscuren/download_improvements
eth, eth/downloader: improve downloader and remove asynchronousness
Diffstat (limited to 'eth/backend.go')
-rw-r--r--eth/backend.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/eth/backend.go b/eth/backend.go
index 7c1d7d617..783f33908 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -217,9 +217,9 @@ func New(config *Config) (*Ethereum, error) {
}
eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.EventMux())
- eth.downloader = downloader.New(eth.chainManager.HasBlock, eth.chainManager.InsertChain, eth.chainManager.Td)
+ eth.downloader = downloader.New(eth.chainManager.HasBlock, eth.chainManager.InsertChain)
eth.pow = ethash.New(eth.chainManager)
- eth.txPool = core.NewTxPool(eth.EventMux(), eth.chainManager.State)
+ eth.txPool = core.NewTxPool(eth.EventMux(), eth.chainManager.State, eth.chainManager.GasLimit)
eth.blockProcessor = core.NewBlockProcessor(stateDb, extraDb, eth.pow, eth.txPool, eth.chainManager, eth.EventMux())
eth.chainManager.SetProcessor(eth.blockProcessor)
eth.whisper = whisper.New()
@@ -447,7 +447,7 @@ func (self *Ethereum) SuggestPeer(nodeURL string) error {
}
func (s *Ethereum) Stop() {
- s.txSub.Unsubscribe() // quits txBroadcastLoop
+ s.txSub.Unsubscribe() // quits txBroadcastLoop
s.protocolManager.Stop()
s.txPool.Stop()