From: Chengcheng Zhang <943420582@qq.com> Date: Tue, 2 Jul 2019 08:07:01 +0000 (+0800) Subject: update X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=commitdiff_plain;h=f94334625f38f0e2bb0e2c3c5847861689ee267a update --- diff --git a/wallet/indexer.go b/wallet/indexer.go index b97c15f5..a402d337 100644 --- a/wallet/indexer.go +++ b/wallet/indexer.go @@ -105,15 +105,13 @@ transactionLoop: var hash [32]byte sha3pool.Sum256(hash[:], v.ControlProgram()) - cp, err := w.store.GetControlProgram(bc.NewHash(hash)) + _, err := w.store.GetControlProgram(bc.NewHash(hash)) if err != nil { log.WithFields(log.Fields{"module": logModule, "err": err, "hash": string(hash[:])}).Error("filterAccountTxs fail.") continue } - if cp != nil { - annotatedTxs = append(annotatedTxs, w.buildAnnotatedTransaction(tx, b, statusFail, pos)) - continue transactionLoop - } + annotatedTxs = append(annotatedTxs, w.buildAnnotatedTransaction(tx, b, statusFail, pos)) + continue transactionLoop } for _, v := range tx.Inputs { @@ -122,15 +120,13 @@ transactionLoop: log.WithFields(log.Fields{"module": logModule, "err": err, "outputID": outid.String()}).Error("filterAccountTxs fail.") continue } - utxo, err := w.store.GetStandardUTXO(outid) + _, err = w.store.GetStandardUTXO(outid) if err != nil { log.WithFields(log.Fields{"module": logModule, "err": err, "outputID": outid.String()}).Error("filterAccountTxs fail.") continue } - if utxo != nil { - annotatedTxs = append(annotatedTxs, w.buildAnnotatedTransaction(tx, b, statusFail, pos)) - continue transactionLoop - } + annotatedTxs = append(annotatedTxs, w.buildAnnotatedTransaction(tx, b, statusFail, pos)) + continue transactionLoop } }