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

sync with btcjson changes to getrawtransaction.

Browse source 
ok oga@
This commit is contained in:
David Hill 2014-01-29 21:21:58 -05:00
parent 82fca37eae
commit b532860477
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rpcserver.go
View file

@ -1073,7 +1073,7 @@ func handleGetRawTransaction(s *rpcServer, cmd btcjson.Cmd) (interface{}, error)
// When the verbose flag isn't set, simply return the network-serialized // When the verbose flag isn't set, simply return the network-serialized
// transaction as a hex-encoded string. // transaction as a hex-encoded string.
if !c.Verbose { if c.Verbose == 0 {
mtxHex, err := messageToHex(mtx) mtxHex, err := messageToHex(mtx)
if err != nil { if err != nil {
return nil, err return nil, err

6
util/btcctl/btcctl.go
View file

@ -69,7 +69,7 @@ var commandHandlers = map[string]*handlerData{
"getnewaddress": &handlerData{0, 1, displayGeneric, nil, makeGetNewAddress, "[account]"}, "getnewaddress": &handlerData{0, 1, displayGeneric, nil, makeGetNewAddress, "[account]"},
"getpeerinfo": &handlerData{0, 0, displayJSONDump, nil, makeGetPeerInfo, ""}, "getpeerinfo": &handlerData{0, 0, displayJSONDump, nil, makeGetPeerInfo, ""},
"getrawmempool": &handlerData{0, 1, displayJSONDump, []conversionHandler{toBool}, makeGetRawMempool, "[verbose=false]"}, "getrawmempool": &handlerData{0, 1, displayJSONDump, []conversionHandler{toBool}, makeGetRawMempool, "[verbose=false]"},
"getrawtransaction": &handlerData{1, 1, displayJSONDump, []conversionHandler{nil, toBool}, makeGetRawTransaction, "<txhash> [verbose=false]"}, "getrawtransaction": &handlerData{1, 1, displayJSONDump, []conversionHandler{nil, toInt}, makeGetRawTransaction, "<txhash> [verbose=0]"},
"getwork": &handlerData{0, 1, displayJSONDump, nil, makeGetWork, "[jsonrequestobject]"}, "getwork": &handlerData{0, 1, displayJSONDump, nil, makeGetWork, "[jsonrequestobject]"},
"help": &handlerData{0, 1, displayGeneric, nil, makeHelp, "[commandName]"}, "help": &handlerData{0, 1, displayGeneric, nil, makeHelp, "[commandName]"},
"importprivkey": &handlerData{1, 2, displayGeneric, []conversionHandler{nil, nil, toBool}, makeImportPrivKey, "<wifprivkey> [label] [rescan=true]"}, "importprivkey": &handlerData{1, 2, displayGeneric, []conversionHandler{nil, nil, toBool}, makeImportPrivKey, "<wifprivkey> [label] [rescan=true]"},
@ -411,9 +411,9 @@ func makeHelp(args []interface{}) (btcjson.Cmd, error) {
// makeRawTransaction generates the cmd structure for // makeRawTransaction generates the cmd structure for
// getrawtransaction commands. // getrawtransaction commands.
func makeGetRawTransaction(args []interface{}) (btcjson.Cmd, error) { func makeGetRawTransaction(args []interface{}) (btcjson.Cmd, error) {
opt := make([]bool, 0, 1) opt := make([]int, 0, 1)
if len(args) > 1 { if len(args) > 1 {
opt = append(opt, args[1].(bool)) opt = append(opt, args[1].(int))
} }
return btcjson.NewGetRawTransactionCmd("btcctl", args[0].(string), opt...) return btcjson.NewGetRawTransactionCmd("btcctl", args[0].(string), opt...)