diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-10-25 17:18:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-25 17:18:44 +0800 |
| commit | 0095531a58772b1f5bd1547169790dbde84ec78a (patch) | |
| tree | 91b9e56dbcb9afe4058c0f41f33ebc7812201abc /eth | |
| parent | ca376ead88a5a26626a90abdb62f4de7f6313822 (diff) | |
| download | dexon-0095531a58772b1f5bd1547169790dbde84ec78a.tar.gz dexon-0095531a58772b1f5bd1547169790dbde84ec78a.tar.zst dexon-0095531a58772b1f5bd1547169790dbde84ec78a.zip | |
core, eth, les: fix messy code (#15367)
* core, eth, les: fix messy code
* les: fixed tx status test and rlp encoding
* core: add a workaround for light sync
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/helper_test.go | 5 | ||||
| -rw-r--r-- | eth/protocol.go | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/eth/helper_test.go b/eth/helper_test.go index b66553135..f02242b15 100644 --- a/eth/helper_test.go +++ b/eth/helper_test.go @@ -97,7 +97,7 @@ type testTxPool struct { // AddRemotes appends a batch of transactions to the pool, and notifies any // listeners if the addition channel is non nil -func (p *testTxPool) AddRemotes(txs []*types.Transaction) error { +func (p *testTxPool) AddRemotes(txs []*types.Transaction) []error { p.lock.Lock() defer p.lock.Unlock() @@ -105,8 +105,7 @@ func (p *testTxPool) AddRemotes(txs []*types.Transaction) error { if p.added != nil { p.added <- txs } - - return nil + return make([]error, len(txs)) } // Pending returns all the transactions known to the pool diff --git a/eth/protocol.go b/eth/protocol.go index 2c41376fa..cd7db57f2 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -97,7 +97,7 @@ var errorToString = map[int]string{ type txPool interface { // AddRemotes should add the given transactions to the pool. - AddRemotes([]*types.Transaction) error + AddRemotes([]*types.Transaction) []error // Pending should return pending transactions. // The slice should be modifiable by the caller. |