From 2b7326ae5259ea84ffbfc253d93e8eab9f208583 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Tue, 15 May 2018 21:08:31 -0700 Subject: [PATCH] blockchain/indexers: use latest API for cf indexing --- blockchain/indexers/cfindex.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/blockchain/indexers/cfindex.go b/blockchain/indexers/cfindex.go index 552fa953..9cbf1bd5 100644 --- a/blockchain/indexers/cfindex.go +++ b/blockchain/indexers/cfindex.go @@ -11,10 +11,10 @@ import ( "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/database" + "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil/gcs" "github.com/btcsuite/btcutil/gcs/builder" - "github.com/btcsuite/btcd/wire" ) const ( @@ -154,9 +154,9 @@ func storeFilter(dbTx database.Tx, block *btcutil.Block, f *gcs.Filter, // Start by storing the filter. h := block.Hash() - var basicFilterBytes []byte - if f != nil { - basicFilterBytes = f.NBytes() + filterBytes, err := f.NBytes() + if err != nil { + return err } err = dbStoreFilterIdxEntry(dbTx, fkey, h, filterBytes) if err != nil { @@ -205,7 +205,7 @@ func (idx *CfIndex) ConnectBlock(dbTx database.Tx, block *btcutil.Block, view *blockchain.UtxoViewpoint) error { f, err := builder.BuildBasicFilter(block.MsgBlock()) - if err != nil && err != gcs.ErrNoData { + if err != nil { return err } @@ -215,7 +215,7 @@ func (idx *CfIndex) ConnectBlock(dbTx database.Tx, block *btcutil.Block, } f, err = builder.BuildExtFilter(block.MsgBlock()) - if err != nil && err != gcs.ErrNoData { + if err != nil { return err }