LBRYCommunity/lbcwallet
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 14 Packages Wiki Activity

Use btcjson v2 types with the updated btcrpcclient.

Browse source 
btcrpcclient commit 9ca93b30ad11ec34348d2d788c58019571bf9524 switched
the client to btcjson v2 and broke the wallet build.  This change is
the minimum amount of work to make wallet work again.

The rpc server still uses btcjson v1, so there will be 2 versions of
btcjson linked in the resulting binary.  This is not optimal but not
compiling is worse.
This commit is contained in:
Josh Rickmar 2015-04-06 13:13:57 -04:00
parent 3940e853f8
commit fbe92830c1
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
chain/chain.go
View file

@ -21,7 +21,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/btcsuite/btcd/btcjson/btcws" "github.com/btcsuite/btcd/btcjson/v2/btcjson"
"github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcrpcclient" "github.com/btcsuite/btcrpcclient"
@ -209,10 +209,10 @@ func (c *Client) BlockStamp() (*waddrmgr.BlockStamp, error) {
} }
} }
// parseBlock parses a btcws definition of the block a tx is mined it to the // parseBlock parses a btcjson definition of the block a tx is mined it to the
// Block structure of the txstore package, and the block index. This is done // Block structure of the txstore package, and the block index. This is done
// here since btcrpcclient doesn't parse this nicely for us. // here since btcrpcclient doesn't parse this nicely for us.
func parseBlock(block *btcws.BlockDetails) (blk *txstore.Block, idx int, err error) { func parseBlock(block *btcjson.BlockDetails) (blk *txstore.Block, idx int, err error) {
if block == nil { if block == nil {
return nil, btcutil.TxIndexUnknown, nil return nil, btcutil.TxIndexUnknown, nil
} }
@ -241,7 +241,7 @@ func (c *Client) onBlockDisconnected(hash *wire.ShaHash, height int32) {
c.enqueueNotification <- BlockDisconnected{Hash: *hash, Height: height} c.enqueueNotification <- BlockDisconnected{Hash: *hash, Height: height}
} }
func (c *Client) onRecvTx(tx *btcutil.Tx, block *btcws.BlockDetails) { func (c *Client) onRecvTx(tx *btcutil.Tx, block *btcjson.BlockDetails) {
var blk *txstore.Block var blk *txstore.Block
index := btcutil.TxIndexUnknown index := btcutil.TxIndexUnknown
if block != nil { if block != nil {
@ -257,7 +257,7 @@ func (c *Client) onRecvTx(tx *btcutil.Tx, block *btcws.BlockDetails) {
c.enqueueNotification <- RecvTx{tx, blk} c.enqueueNotification <- RecvTx{tx, blk}
} }
func (c *Client) onRedeemingTx(tx *btcutil.Tx, block *btcws.BlockDetails) { func (c *Client) onRedeemingTx(tx *btcutil.Tx, block *btcjson.BlockDetails) {
var blk *txstore.Block var blk *txstore.Block
index := btcutil.TxIndexUnknown index := btcutil.TxIndexUnknown
if block != nil { if block != nil {