LBRYCommunity/lbcd
1
0
Fork 0
Code Issues17 Pull requests4 Projects Releases28 Packages Wiki Activity

Correct error handling from the previous commit.

Browse source
This commit is contained in:
Dave Collins 2013-12-30 20:27:36 -06:00
parent 28d08f8b16
commit f2a2744bec
1 changed files with 8 additions and 8 deletions

16
rpcserver.go
View file

@ -699,7 +699,7 @@ func handleDebugLevel(s *rpcServer, cmd btcjson.Cmd,
// createVinList returns a slice of JSON objects for the inputs of the passed // createVinList returns a slice of JSON objects for the inputs of the passed
// transaction. // transaction.
func createVinList(mtx *btcwire.MsgTx) ([]btcjson.Vin, *btcjson.Error) { func createVinList(mtx *btcwire.MsgTx) ([]btcjson.Vin, error) {
tx := btcutil.NewTx(mtx) tx := btcutil.NewTx(mtx)
vinList := make([]btcjson.Vin, len(mtx.TxIn)) vinList := make([]btcjson.Vin, len(mtx.TxIn))
for i, v := range mtx.TxIn { for i, v := range mtx.TxIn {
@ -711,7 +711,7 @@ func createVinList(mtx *btcwire.MsgTx) ([]btcjson.Vin, *btcjson.Error) {
disbuf, err := btcscript.DisasmString(v.SignatureScript) disbuf, err := btcscript.DisasmString(v.SignatureScript)
if err != nil { if err != nil {
return nil, &btcjson.Error{ return nil, btcjson.Error{
Code: btcjson.ErrInternal.Code, Code: btcjson.ErrInternal.Code,
Message: err.Error(), Message: err.Error(),
} }
@ -728,7 +728,7 @@ func createVinList(mtx *btcwire.MsgTx) ([]btcjson.Vin, *btcjson.Error) {
// createVoutList returns a slice of JSON objects for the outputs of the passed // createVoutList returns a slice of JSON objects for the outputs of the passed
// transaction. // transaction.
func createVoutList(mtx *btcwire.MsgTx, net btcwire.BitcoinNet) ([]btcjson.Vout, *btcjson.Error) { func createVoutList(mtx *btcwire.MsgTx, net btcwire.BitcoinNet) ([]btcjson.Vout, error) {
voutList := make([]btcjson.Vout, len(mtx.TxOut)) voutList := make([]btcjson.Vout, len(mtx.TxOut))
for i, v := range mtx.TxOut { for i, v := range mtx.TxOut {
voutList[i].N = i voutList[i].N = i
@ -736,7 +736,7 @@ func createVoutList(mtx *btcwire.MsgTx, net btcwire.BitcoinNet) ([]btcjson.Vout,
disbuf, err := btcscript.DisasmString(v.PkScript) disbuf, err := btcscript.DisasmString(v.PkScript)
if err != nil { if err != nil {
return nil, &btcjson.Error{ return nil, btcjson.Error{
Code: btcjson.ErrInternal.Code, Code: btcjson.ErrInternal.Code,
Message: err.Error(), Message: err.Error(),
} }
@ -832,11 +832,11 @@ func handleGetBestBlockHash(s *rpcServer, cmd btcjson.Cmd, walletNotification ch
// messageToHex serializes a message to the wire protocol encoding using the // messageToHex serializes a message to the wire protocol encoding using the
// latest protocol version and returns a hex-encoded string of the result. // latest protocol version and returns a hex-encoded string of the result.
func messageToHex(msg btcwire.Message) (string, *btcjson.Error) { func messageToHex(msg btcwire.Message) (string, error) {
var buf bytes.Buffer var buf bytes.Buffer
err := msg.BtcEncode(&buf, btcwire.ProtocolVersion) err := msg.BtcEncode(&buf, btcwire.ProtocolVersion)
if err != nil { if err != nil {
return "", &btcjson.Error{ return "", btcjson.Error{
Code: btcjson.ErrInternal.Code, Code: btcjson.ErrInternal.Code,
Message: err.Error(), Message: err.Error(),
} }
@ -1120,14 +1120,14 @@ func handleGetRawTransaction(s *rpcServer, cmd btcjson.Cmd, walletNotification c
rawTxn, jsonErr := createTxRawResult(s.server.btcnet, c.Txid, mtx, blk, maxidx, blksha) rawTxn, jsonErr := createTxRawResult(s.server.btcnet, c.Txid, mtx, blk, maxidx, blksha)
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, *jsonErr return nil, jsonErr
} }
return *rawTxn, nil return *rawTxn, nil
} }
// createTxRawResult converts the passed transaction and associated parameters // createTxRawResult converts the passed transaction and associated parameters
// to a raw transaction JSON object. // to a raw transaction JSON object.
func createTxRawResult(net btcwire.BitcoinNet, txSha string, mtx *btcwire.MsgTx, blk *btcutil.Block, maxidx int64, blksha *btcwire.ShaHash) (*btcjson.TxRawResult, *btcjson.Error) { func createTxRawResult(net btcwire.BitcoinNet, txSha string, mtx *btcwire.MsgTx, blk *btcutil.Block, maxidx int64, blksha *btcwire.ShaHash) (*btcjson.TxRawResult, error) {
mtxHex, err := messageToHex(mtx) mtxHex, err := messageToHex(mtx)
if err != nil { if err != nil {
return nil, err return nil, err