aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelföldi Zsolt <zsfelfoldi@gmail.com>2018-01-27 01:30:45 +0800
committerPéter Szilágyi <peterke@gmail.com>2018-01-27 01:30:45 +0800
commit23bca0f374b3e1ccfa19bfeb86d06a0aca82184b (patch)
tree1bc753c7f9b3170fef68f37484d8572fb74c0087
parent367c329b88617a2831a9fe20f7b47bb6ab7e255d (diff)
downloadgo-tangerine-23bca0f374b3e1ccfa19bfeb86d06a0aca82184b.tar
go-tangerine-23bca0f374b3e1ccfa19bfeb86d06a0aca82184b.tar.gz
go-tangerine-23bca0f374b3e1ccfa19bfeb86d06a0aca82184b.tar.bz2
go-tangerine-23bca0f374b3e1ccfa19bfeb86d06a0aca82184b.tar.lz
go-tangerine-23bca0f374b3e1ccfa19bfeb86d06a0aca82184b.tar.xz
go-tangerine-23bca0f374b3e1ccfa19bfeb86d06a0aca82184b.tar.zst
go-tangerine-23bca0f374b3e1ccfa19bfeb86d06a0aca82184b.zip
les: fix TxStatusMsg RLP coding (#15974)
-rw-r--r--les/handler.go4
-rw-r--r--les/handler_test.go2
-rw-r--r--les/protocol.go4
3 files changed, 5 insertions, 5 deletions
diff --git a/les/handler.go b/les/handler.go
index d627c3e18..57657e84f 100644
--- a/les/handler.go
+++ b/les/handler.go
@@ -1014,7 +1014,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
for i, stat := range stats {
if stat.Status == core.TxStatusUnknown {
if errs := pm.txpool.AddRemotes([]*types.Transaction{req.Txs[i]}); errs[0] != nil {
- stats[i].Error = errs[0]
+ stats[i].Error = errs[0].Error()
continue
}
stats[i] = pm.txStatus([]common.Hash{hashes[i]})[0]
@@ -1055,7 +1055,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
p.Log().Trace("Received tx status response")
var resp struct {
ReqID, BV uint64
- Status []core.TxStatus
+ Status []txStatus
}
if err := msg.Decode(&resp); err != nil {
return errResp(ErrDecode, "msg %v: %v", msg, err)
diff --git a/les/handler_test.go b/les/handler_test.go
index 7d67af26a..10e5499a3 100644
--- a/les/handler_test.go
+++ b/les/handler_test.go
@@ -444,7 +444,7 @@ func TestTransactionStatusLes2(t *testing.T) {
// test error status by sending an underpriced transaction
tx0, _ := types.SignTx(types.NewTransaction(0, acc1Addr, big.NewInt(10000), params.TxGas, nil, nil), signer, testBankKey)
- test(tx0, true, txStatus{Status: core.TxStatusUnknown, Error: core.ErrUnderpriced})
+ test(tx0, true, txStatus{Status: core.TxStatusUnknown, Error: core.ErrUnderpriced.Error()})
tx1, _ := types.SignTx(types.NewTransaction(0, acc1Addr, big.NewInt(10000), params.TxGas, big.NewInt(100000000000), nil), signer, testBankKey)
test(tx1, false, txStatus{Status: core.TxStatusUnknown}) // query before sending, should be unknown
diff --git a/les/protocol.go b/les/protocol.go
index 6a7354d1c..e1c4625bc 100644
--- a/les/protocol.go
+++ b/les/protocol.go
@@ -224,6 +224,6 @@ type proofsData [][]rlp.RawValue
type txStatus struct {
Status core.TxStatus
- Lookup *core.TxLookupEntry
- Error error
+ Lookup *core.TxLookupEntry `rlp:"nil"`
+ Error string
}