LBRYFoundation/lbcd
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbcd.git synced 2025-09-03 02:35:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Return wire.MsgBlock from GetBlock(Async).

Browse source 
This modifies the return value of the GetBlock and GetBlockAsync
functions to a raw *wire.MsgBlock instead of *btcutil.Block.

This is being done because a btcutil.Block assumes there is a height
associated with the block and the block height is not part of a raw
serialized block as returned by the underlying non-verbose RPC API
getblock call and thus is not available to populate a btcutil.Block
correctly.

A raw wire.Block correctly matches what the underlying RPC call is
actually returning and thus avoids the confusion that could occur.
This commit is contained in:
Dave Collins 2016-09-15 14:06:36 -05:00
parent 96ed4cb5b0
commit 982229439a
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
chain.go
View file

@ -12,7 +12,6 @@ import (
"github.com/btcsuite/btcd/btcjson" "github.com/btcsuite/btcd/btcjson"
"github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
) )
// FutureGetBestBlockHashResult is a future promise to deliver the result of a // FutureGetBestBlockHashResult is a future promise to deliver the result of a
@ -58,7 +57,7 @@ type FutureGetBlockResult chan *response
// Receive waits for the response promised by the future and returns the raw // Receive waits for the response promised by the future and returns the raw
// block requested from the server given its hash. // block requested from the server given its hash.
func (r FutureGetBlockResult) Receive() (*btcutil.Block, error) { func (r FutureGetBlockResult) Receive() (*wire.MsgBlock, error) {
res, err := receiveFuture(r) res, err := receiveFuture(r)
if err != nil { if err != nil {
return nil, err return nil, err
@ -83,7 +82,7 @@ func (r FutureGetBlockResult) Receive() (*btcutil.Block, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
return btcutil.NewBlock(&msgBlock), nil return &msgBlock, nil
} }
// GetBlockAsync returns an instance of a type that can be used to get the // GetBlockAsync returns an instance of a type that can be used to get the
@ -105,7 +104,7 @@ func (c *Client) GetBlockAsync(blockHash *chainhash.Hash) FutureGetBlockResult {
// //
// See GetBlockVerbose to retrieve a data structure with information about the // See GetBlockVerbose to retrieve a data structure with information about the
// block instead. // block instead.
func (c *Client) GetBlock(blockHash *chainhash.Hash) (*btcutil.Block, error) { func (c *Client) GetBlock(blockHash *chainhash.Hash) (*wire.MsgBlock, error) {
return c.GetBlockAsync(blockHash).Receive() return c.GetBlockAsync(blockHash).Receive()
} }