aboutsummaryrefslogtreecommitdiffstats
path: root/ethereum.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-12-18 20:12:54 +0800
committerobscuren <geffobscura@gmail.com>2014-12-18 20:12:54 +0800
commit49e0267fe76cfd13eaf3e5e26caa637b93dbdd29 (patch)
treeaec7d379e9a981af2c72f194acc594d658b8e7cf /ethereum.go
parent590aace88dce9922d40fca71e87905383a71d12b (diff)
downloadgo-tangerine-49e0267fe76cfd13eaf3e5e26caa637b93dbdd29.tar.gz
go-tangerine-49e0267fe76cfd13eaf3e5e26caa637b93dbdd29.tar.zst
go-tangerine-49e0267fe76cfd13eaf3e5e26caa637b93dbdd29.zip
Locks, refactor, tests
* Added additional chain tests * Added proper mutex' on chain * Removed ethereum dependencies
Diffstat (limited to 'ethereum.go')
-rw-r--r--ethereum.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/ethereum.go b/ethereum.go
index e8b1a9500..5d74e28e9 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -128,9 +128,9 @@ func New(db ethutil.Database, clientIdentity wire.ClientIdentity, keyManager *cr
}
ethereum.blockPool = NewBlockPool(ethereum)
- ethereum.txPool = core.NewTxPool(ethereum)
ethereum.blockChain = core.NewChainManager(ethereum.EventMux())
- ethereum.blockManager = core.NewBlockManager(ethereum)
+ ethereum.txPool = core.NewTxPool(ethereum.blockChain, ethereum, ethereum.EventMux())
+ ethereum.blockManager = core.NewBlockManager(ethereum.txPool, ethereum.blockChain, ethereum.EventMux())
ethereum.blockChain.SetProcessor(ethereum.blockManager)
// Start the tx pool