blockchain/indexers: use latest API for cf indexing

This commit is contained in:
Olaoluwa Osuntokun 2018-05-15 21:08:31 -07:00
parent f48bc43421
commit 2b7326ae52

View file

@ -11,10 +11,10 @@ import (
"github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/database" "github.com/btcsuite/btcd/database"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil"
"github.com/btcsuite/btcutil/gcs" "github.com/btcsuite/btcutil/gcs"
"github.com/btcsuite/btcutil/gcs/builder" "github.com/btcsuite/btcutil/gcs/builder"
"github.com/btcsuite/btcd/wire"
) )
const ( const (
@ -154,9 +154,9 @@ func storeFilter(dbTx database.Tx, block *btcutil.Block, f *gcs.Filter,
// Start by storing the filter. // Start by storing the filter.
h := block.Hash() h := block.Hash()
var basicFilterBytes []byte filterBytes, err := f.NBytes()
if f != nil { if err != nil {
basicFilterBytes = f.NBytes() return err
} }
err = dbStoreFilterIdxEntry(dbTx, fkey, h, filterBytes) err = dbStoreFilterIdxEntry(dbTx, fkey, h, filterBytes)
if err != nil { if err != nil {
@ -205,7 +205,7 @@ func (idx *CfIndex) ConnectBlock(dbTx database.Tx, block *btcutil.Block,
view *blockchain.UtxoViewpoint) error { view *blockchain.UtxoViewpoint) error {
f, err := builder.BuildBasicFilter(block.MsgBlock()) f, err := builder.BuildBasicFilter(block.MsgBlock())
if err != nil && err != gcs.ErrNoData { if err != nil {
return err return err
} }
@ -215,7 +215,7 @@ func (idx *CfIndex) ConnectBlock(dbTx database.Tx, block *btcutil.Block,
} }
f, err = builder.BuildExtFilter(block.MsgBlock()) f, err = builder.BuildExtFilter(block.MsgBlock())
if err != nil && err != gcs.ErrNoData { if err != nil {
return err return err
} }