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

Update SearchRawTransaction calls for latest API.

Browse source 
This commit modifies the SearchRawTransactions and
SearchRawTransactionsVerbose functions to work properly with the latest
searchrawtransactions API in btcd.

In particular, this involves changing the return value from
[]*btcjson.TxRawResult to []*btcjson.SearchRawTransactionResult and
adding the additional optional parameter which specifies whether or not
to include information about the previous outputs.
This commit is contained in:
Dave Collins 2015-08-23 13:30:13 -05:00
parent 7cb04ae6db
commit 34db203930
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
rawtransactions.go
View file

@ -552,7 +552,8 @@ func (r FutureSearchRawTransactionsResult) Receive() ([]*wire.MsgTx, error) {
func (c *Client) SearchRawTransactionsAsync(address btcutil.Address, skip, count int) FutureSearchRawTransactionsResult { func (c *Client) SearchRawTransactionsAsync(address btcutil.Address, skip, count int) FutureSearchRawTransactionsResult {
addr := address.EncodeAddress() addr := address.EncodeAddress()
verbose := btcjson.Int(0) verbose := btcjson.Int(0)
cmd := btcjson.NewSearchRawTransactionsCmd(addr, verbose, &skip, &count) cmd := btcjson.NewSearchRawTransactionsCmd(addr, verbose, &skip, &count,
nil)
return c.sendCmd(cmd) return c.sendCmd(cmd)
} }
@ -574,14 +575,14 @@ type FutureSearchRawTransactionsVerboseResult chan *response
// Receive waits for the response promised by the future and returns the // Receive waits for the response promised by the future and returns the
// found raw transactions. // found raw transactions.
func (r FutureSearchRawTransactionsVerboseResult) Receive() ([]*btcjson.TxRawResult, error) { func (r FutureSearchRawTransactionsVerboseResult) Receive() ([]*btcjson.SearchRawTransactionsResult, error) {
res, err := receiveFuture(r) res, err := receiveFuture(r)
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Unmarshal as an array of raw transaction results. // Unmarshal as an array of raw transaction results.
var result []*btcjson.TxRawResult var result []*btcjson.SearchRawTransactionsResult
err = json.Unmarshal(res, &result) err = json.Unmarshal(res, &result)
if err != nil { if err != nil {
return nil, err return nil, err
@ -595,10 +596,17 @@ func (r FutureSearchRawTransactionsVerboseResult) Receive() ([]*btcjson.TxRawRes
// function on the returned instance. // function on the returned instance.
// //
// See SearchRawTransactionsVerbose for the blocking version and more details. // See SearchRawTransactionsVerbose for the blocking version and more details.
func (c *Client) SearchRawTransactionsVerboseAsync(address btcutil.Address, skip, count int) FutureSearchRawTransactionsVerboseResult { func (c *Client) SearchRawTransactionsVerboseAsync(address btcutil.Address, skip,
count int, includePrevOut bool) FutureSearchRawTransactionsVerboseResult {
addr := address.EncodeAddress() addr := address.EncodeAddress()
verbose := btcjson.Int(1) verbose := btcjson.Int(1)
cmd := btcjson.NewSearchRawTransactionsCmd(addr, verbose, &skip, &count) var prevOut *int
if includePrevOut {
prevOut = btcjson.Int(1)
}
cmd := btcjson.NewSearchRawTransactionsCmd(addr, verbose, &skip, &count,
prevOut)
return c.sendCmd(cmd) return c.sendCmd(cmd)
} }
@ -609,6 +617,9 @@ func (c *Client) SearchRawTransactionsVerboseAsync(address btcutil.Address, skip
// specifically been enabled. // specifically been enabled.
// //
// See SearchRawTransactions to retrieve a list of raw transactions instead. // See SearchRawTransactions to retrieve a list of raw transactions instead.
func (c *Client) SearchRawTransactionsVerbose(address btcutil.Address, skip, count int) ([]*btcjson.TxRawResult, error) { func (c *Client) SearchRawTransactionsVerbose(address btcutil.Address, skip,
return c.SearchRawTransactionsVerboseAsync(address, skip, count).Receive() count int, includePrevOut bool) ([]*btcjson.SearchRawTransactionsResult, error) {
return c.SearchRawTransactionsVerboseAsync(address, skip, count,
includePrevOut).Receive()
} }