diff options
Diffstat (limited to 'ethchain')
| -rw-r--r-- | ethchain/events.go | 14 | ||||
| -rw-r--r-- | ethchain/state_manager.go | 2 | ||||
| -rw-r--r-- | ethchain/transaction_pool.go | 9 |
3 files changed, 10 insertions, 15 deletions
diff --git a/ethchain/events.go b/ethchain/events.go index 05c21edfe..304e741b7 100644 --- a/ethchain/events.go +++ b/ethchain/events.go @@ -1,10 +1,10 @@ package ethchain -type TxEvent struct { - Type int // TxPre || TxPost - Tx *Transaction -} +// TxPreEvent is posted when a transaction enters the transaction pool. +type TxPreEvent struct{ Tx *Transaction } -type NewBlockEvent struct { - Block *Block -} +// TxPostEvent is posted when a transaction has been processed. +type TxPostEvent struct{ Tx *Transaction } + +// NewBlockEvent is posted when a block has been imported. +type NewBlockEvent struct{ Block *Block } diff --git a/ethchain/state_manager.go b/ethchain/state_manager.go index e45d44752..0fe7001c6 100644 --- a/ethchain/state_manager.go +++ b/ethchain/state_manager.go @@ -191,7 +191,7 @@ done: } // Notify all subscribers - self.eth.EventMux().Post(TxEvent{TxPost, tx}) + self.eth.EventMux().Post(TxPostEvent{tx}) receipts = append(receipts, receipt) handled = append(handled, tx) diff --git a/ethchain/transaction_pool.go b/ethchain/transaction_pool.go index 7f8a5de42..7bd3e9ffd 100644 --- a/ethchain/transaction_pool.go +++ b/ethchain/transaction_pool.go @@ -14,17 +14,12 @@ import ( var txplogger = ethlog.NewLogger("TXP") -const ( - txPoolQueueSize = 50 -) +const txPoolQueueSize = 50 type TxPoolHook chan *Transaction type TxMsgTy byte const ( - TxPre = iota - TxPost - minGasPrice = 1000000 ) @@ -169,7 +164,7 @@ out: txplogger.Debugf("(t) %x => %x (%v) %x\n", tx.Sender()[:4], tmp, tx.Value, tx.Hash()) // Notify the subscribers - pool.Ethereum.EventMux().Post(TxEvent{TxPre, tx}) + pool.Ethereum.EventMux().Post(TxPreEvent{tx}) } case <-pool.quit: break out |