aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-12-18 20:22:59 +0800
committerobscuren <geffobscura@gmail.com>2014-12-18 20:22:59 +0800
commit0dc566124aee24cf3f01b4e586bde7752da89824 (patch)
tree22bfe271447f8b42598b3066cb92d87df93c7095 /core
parent721e8ae93f9b8918ff4bc74af86c530bacacea00 (diff)
downloadgo-tangerine-0dc566124aee24cf3f01b4e586bde7752da89824.tar
go-tangerine-0dc566124aee24cf3f01b4e586bde7752da89824.tar.gz
go-tangerine-0dc566124aee24cf3f01b4e586bde7752da89824.tar.bz2
go-tangerine-0dc566124aee24cf3f01b4e586bde7752da89824.tar.lz
go-tangerine-0dc566124aee24cf3f01b4e586bde7752da89824.tar.xz
go-tangerine-0dc566124aee24cf3f01b4e586bde7752da89824.tar.zst
go-tangerine-0dc566124aee24cf3f01b4e586bde7752da89824.zip
Merge fixes
Diffstat (limited to 'core')
-rw-r--r--core/chain_manager.go5
-rw-r--r--core/transaction_pool.go6
-rw-r--r--core/types/common.go5
3 files changed, 6 insertions, 10 deletions
diff --git a/core/chain_manager.go b/core/chain_manager.go
index 4bbecd109..e6268c01e 100644
--- a/core/chain_manager.go
+++ b/core/chain_manager.go
@@ -101,7 +101,10 @@ func NewChainManager(mux *event.TypeMux) *ChainManager {
}
func (self *ChainManager) Status() (td *big.Int, currentBlock []byte, genesisBlock []byte) {
- return self.TD, self.CurrentBlock.Hash(), self.Genesis().Hash()
+ self.mu.RLock()
+ defer self.mu.RUnlock()
+
+ return self.td, self.currentBlock.Hash(), self.Genesis().Hash()
}
func (self *ChainManager) SetProcessor(proc types.BlockProcessor) {
diff --git a/core/transaction_pool.go b/core/transaction_pool.go
index 86286f23d..2bbda7d90 100644
--- a/core/transaction_pool.go
+++ b/core/transaction_pool.go
@@ -72,19 +72,17 @@ type TxPool struct {
subscribers []chan TxMsg
- broadcaster types.Broadcaster
chainManager *ChainManager
eventMux *event.TypeMux
}
-func NewTxPool(chainManager *ChainManager, broadcaster types.Broadcaster, eventMux *event.TypeMux) *TxPool {
+func NewTxPool(chainManager *ChainManager, eventMux *event.TypeMux) *TxPool {
return &TxPool{
pool: list.New(),
queueChan: make(chan *types.Transaction, txPoolQueueSize),
quit: make(chan bool),
chainManager: chainManager,
eventMux: eventMux,
- broadcaster: broadcaster,
}
}
@@ -96,7 +94,7 @@ func (pool *TxPool) addTransaction(tx *types.Transaction) {
pool.pool.PushBack(tx)
// Broadcast the transaction to the rest of the peers
- pool.Ethereum.EventMux().Post(TxPreEvent{tx})
+ pool.eventMux.Post(TxPreEvent{tx})
}
func (pool *TxPool) ValidateTransaction(tx *types.Transaction) error {
diff --git a/core/types/common.go b/core/types/common.go
index 89cb5f498..ba88b77e1 100644
--- a/core/types/common.go
+++ b/core/types/common.go
@@ -4,13 +4,8 @@ import (
"math/big"
"github.com/ethereum/go-ethereum/state"
- "github.com/ethereum/go-ethereum/wire"
)
type BlockProcessor interface {
Process(*Block) (*big.Int, state.Messages, error)
}
-
-type Broadcaster interface {
- Broadcast(wire.MsgType, []interface{})
-}