update

[bytom/vapor.git] / account / utxo_keeper.go

diff --git a/account/utxo_keeper.go b/account/utxo_keeper.go
index a8a81f7..57d5d68 100644 (file)
--- a/account/utxo_keeper.go
+++ b/account/utxo_keeper.go
@@ -3,15 +3,11 @@ package account
 import (
        "bytes"
        "container/list"
-       "encoding/json"
        "sort"
        "sync"
        "sync/atomic"
        "time"
 
-       log "github.com/sirupsen/logrus"
-
-       "github.com/vapor/database"
        "github.com/vapor/errors"
        "github.com/vapor/protocol/bc"
 )
@@ -56,7 +52,7 @@ type utxoKeeper struct {
        // `sync/atomic` expects the first word in an allocated struct to be 64-bit
        // aligned on both ARM and x86-32. See https://goo.gl/zW7dgq for more details.
        nextIndex     uint64
-       store         database.AccountStorer
+       store         AccountStorer
        mtx           sync.RWMutex
        currentHeight func() uint64
 
@@ -65,7 +61,7 @@ type utxoKeeper struct {
        reservations map[uint64]*reservation
 }
 
-func newUtxoKeeper(f func() uint64, store database.AccountStorer) *utxoKeeper {
+func newUtxoKeeper(f func() uint64, store AccountStorer) *utxoKeeper {
        uk := &utxoKeeper{
                store:         store,
                currentHeight: f,
@@ -223,14 +219,9 @@ func (uk *utxoKeeper) findUtxos(accountID string, assetID *bc.AssetID, useUnconf
                }
        }
 
-       rawUTXOs := uk.store.GetUTXOs()
-       for _, rawUTXO := range rawUTXOs {
-               utxo := new(UTXO)
-               if err := json.Unmarshal(rawUTXO, utxo); err != nil {
-                       log.WithFields(log.Fields{"module": logModule, "err": err}).Error("utxoKeeper findUtxos fail on unmarshal utxo")
-                       continue
-               }
-               appendUtxo(utxo)
+       UTXOs := uk.store.GetUTXOs()
+       for _, UTXO := range UTXOs {
+               appendUtxo(UTXO)
        }
 
        if !useUnconfirmed {
@@ -247,15 +238,7 @@ func (uk *utxoKeeper) findUtxo(outHash bc.Hash, useUnconfirmed bool) (*UTXO, err
        if u, ok := uk.unconfirmed[outHash]; useUnconfirmed && ok {
                return u, nil
        }
-
-       u := &UTXO{}
-       if data := uk.store.GetStandardUTXO(outHash); data != nil {
-               return u, json.Unmarshal(data, u)
-       }
-       if data := uk.store.GetContractUTXO(outHash); data != nil {
-               return u, json.Unmarshal(data, u)
-       }
-       return nil, ErrMatchUTXO
+       return uk.store.GetUTXO(outHash)
 }
 
 func (uk *utxoKeeper) optUTXOs(utxos []*UTXO, amount uint64) ([]*UTXO, uint64, uint64) {