Merge pull request #1212 from fjl/p2p-eth-block-timeout

eth, p2p: improve write timeouts and behaviour under load

2 files changed, 8 insertions, 0 deletions

diff --git a/core/transaction_pool.go b/core/transaction_pool.go
index 77744f8f7..918e7b957 100644
--- a/core/transaction_pool.go
+++ b/core/transaction_pool.go
@@ -247,6 +247,7 @@ func (tp *TxPool) GetTransaction(hash common.Hash) *types.Transaction {
 }
 
 // GetTransactions returns all currently processable transactions.
+// The returned slice may be modified by the caller.
 func (self *TxPool) GetTransactions() (txs types.Transactions) {
 	self.mu.Lock()
 	defer self.mu.Unlock()
diff --git a/core/types/transaction.go b/core/types/transaction.go
index 3d6d31ae7..a03a6b847 100644
--- a/core/types/transaction.go
+++ b/core/types/transaction.go
@@ -67,6 +67,13 @@ func (tx *Transaction) Hash() common.Hash {
 	})
 }
 
+// Size returns the encoded RLP size of tx.
+func (self *Transaction) Size() common.StorageSize {
+	c := writeCounter(0)
+	rlp.Encode(&c, self)
+	return common.StorageSize(c)
+}
+
 func (self *Transaction) Data() []byte {
 	return self.Payload
 }