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

build: update neutrino glide.lock hash, API usage

Browse source
This commit is contained in:
Olaoluwa Osuntokun 2017-06-04 14:40:00 -07:00
parent 3f12fa3c6c
commit dbe472edd6
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
chain/neutrino.go
View file

@ -100,7 +100,7 @@ func (s *NeutrinoClient) GetBlock(hash *chainhash.Hash) (*wire.MsgBlock, error)
// since we can't actually return a FutureGetBlockVerboseResult because the // since we can't actually return a FutureGetBlockVerboseResult because the
// underlying type is private to btcrpcclient. // underlying type is private to btcrpcclient.
func (s *NeutrinoClient) GetBlockHeight(hash *chainhash.Hash) (int32, error) { func (s *NeutrinoClient) GetBlockHeight(hash *chainhash.Hash) (int32, error) {
_, height, err := s.CS.GetBlockByHash(*hash) _, height, err := s.CS.BlockHeaders.FetchHeader(hash)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@ -109,12 +109,12 @@ func (s *NeutrinoClient) GetBlockHeight(hash *chainhash.Hash) (int32, error) {
// GetBestBlock replicates the RPC client's GetBestBlock command. // GetBestBlock replicates the RPC client's GetBestBlock command.
func (s *NeutrinoClient) GetBestBlock() (*chainhash.Hash, int32, error) { func (s *NeutrinoClient) GetBestBlock() (*chainhash.Hash, int32, error) {
header, height, err := s.CS.LatestBlock() chainTip, err := s.CS.BestSnapshot()
if err != nil { if err != nil {
return nil, 0, err return nil, 0, err
} }
hash := header.BlockHash()
return &hash, int32(height), nil return &chainTip.Hash, chainTip.Height, nil
} }
// BlockStamp returns the latest block notified by the client, or an error // BlockStamp returns the latest block notified by the client, or an error
@ -159,7 +159,7 @@ func (s *NeutrinoClient) Rescan(startHash *chainhash.Hash, addrs []btcutil.Addre
for _, op := range outPoints { for _, op := range outPoints {
watchOutPoints = append(watchOutPoints, *op) watchOutPoints = append(watchOutPoints, *op)
} }
header, height, err := s.CS.LatestBlock() header, height, err := s.CS.BlockHeaders.ChainTip()
if err != nil { if err != nil {
return fmt.Errorf("Can't get chain service's best block: %s", err) return fmt.Errorf("Can't get chain service's best block: %s", err)
} }
@ -267,7 +267,7 @@ func (s *NeutrinoClient) onFilteredBlockConnected(height int32,
case <-s.rescanQuit: case <-s.rescanQuit:
return return
} }
bs, err := s.CS.SyncedTo() bs, err := s.CS.BestSnapshot()
if err != nil { if err != nil {
log.Errorf("Can't get chain service's best block: %s", err) log.Errorf("Can't get chain service's best block: %s", err)
return return

2
glide.lock generated
View file

@ -97,7 +97,7 @@ imports:
- name: github.com/kkdai/bstream - name: github.com/kkdai/bstream
version: f391b8402d23024e7c0f624b31267a89998fca95 version: f391b8402d23024e7c0f624b31267a89998fca95
- name: github.com/lightninglabs/neutrino - name: github.com/lightninglabs/neutrino
version: 113c35bb7044bb5a12c1484a5c089f13267026ed version: 84eb5bf51fb61e4133090cef6ce6f7e31703826d
repo: git@github.com:lightninglabs/neutrino repo: git@github.com:lightninglabs/neutrino
- name: golang.org/x/crypto - name: golang.org/x/crypto
version: 0fe963104e9d1877082f8fb38f816fcd97eb1d10 version: 0fe963104e9d1877082f8fb38f816fcd97eb1d10