LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

Fix handleGetBlock/handleGetRawTransaction to return btcjson.Error

Browse source 
Wrap *.BtcEncode errors into btcjson.Error when failing to encode wire
bytes to buffer
This commit is contained in:
Francis Lam 2013-12-08 18:43:47 -05:00
parent 762fc2c11c
commit dd10de9e8b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rpcserver.go
View file

@ -747,7 +747,7 @@ func handleGetBlock(s *rpcServer, cmd btcjson.Cmd, walletNotification chan []byt
var wireBuf bytes.Buffer var wireBuf bytes.Buffer
err := blk.MsgBlock().BtcEncode(&wireBuf, btcwire.ProtocolVersion) err := blk.MsgBlock().BtcEncode(&wireBuf, btcwire.ProtocolVersion)
if err != nil { if err != nil {
return nil, err return nil, btcjson.Error{Code: btcjson.ErrInternal.Code, Message: err.Error()}
} }
blkHex := hex.EncodeToString(wireBuf.Bytes()) blkHex := hex.EncodeToString(wireBuf.Bytes())
return btcjson.BlockResult{Hex: blkHex}, nil return btcjson.BlockResult{Hex: blkHex}, nil
@ -922,21 +922,21 @@ func handleGetRawTransaction(s *rpcServer, cmd btcjson.Cmd, walletNotification c
} }
} }
rawTxn, err := createTxRawResult(s.server.btcnet, c.Txid, mtx, blk, maxidx, blksha, c.Verbose) rawTxn, jsonErr := createTxRawResult(s.server.btcnet, c.Txid, mtx, blk, maxidx, blksha, c.Verbose)
if err != nil { if err != nil {
rpcsLog.Errorf("Cannot create TxRawResult for txSha=%s: %v", txSha, err) rpcsLog.Errorf("Cannot create TxRawResult for txSha=%s: %v", txSha, err)
return nil, err return nil, *jsonErr
} }
return *rawTxn, nil return *rawTxn, nil
} }
func createTxRawResult(net btcwire.BitcoinNet, txSha string, mtx *btcwire.MsgTx, blk *btcutil.Block, maxidx int64, blksha *btcwire.ShaHash, verbose bool) (*btcjson.TxRawResult, error) { func createTxRawResult(net btcwire.BitcoinNet, txSha string, mtx *btcwire.MsgTx, blk *btcutil.Block, maxidx int64, blksha *btcwire.ShaHash, verbose bool) (*btcjson.TxRawResult, *btcjson.Error) {
tx := btcutil.NewTx(mtx) tx := btcutil.NewTx(mtx)
var buf bytes.Buffer var buf bytes.Buffer
err := mtx.BtcEncode(&buf, btcwire.ProtocolVersion) err := mtx.BtcEncode(&buf, btcwire.ProtocolVersion)
if err != nil { if err != nil {
return nil, err return nil, &btcjson.Error{Code: btcjson.ErrInternal.Code, Message: err.Error()}
} }
mtxHex := hex.EncodeToString(buf.Bytes()) mtxHex := hex.EncodeToString(buf.Bytes())