add DeleteAccountUTXOs

diff --git a/account/accounts.go b/account/accounts.go
index f054863..632db13 100644 (file)
--- a/account/accounts.go
+++ b/account/accounts.go
@@ -277,18 +277,9 @@ func (m *Manager) deleteAccountControlPrograms(accountID string) error {
 
 // deleteAccountUtxos deletes utxos matching accountID
 func (m *Manager) deleteAccountUtxos(accountID string) error {
-       rawUTXOs := m.store.GetAccountUTXOs(accountID)
-
-       for _, rawUTXO := range rawUTXOs {
-               utxo := new(UTXO)
-               if err := json.Unmarshal(rawUTXO, utxo); err != nil {
-                       return err
-               }
-               if accountID == utxo.AccountID {
-                       m.store.DeleteStandardUTXO(utxo.OutputID)
-               }
+       if err := m.store.DeleteAccountUTXOs(accountID); err != nil {
+               return err
        }
-
        return nil
 }
 

diff --git a/account/store.go b/account/store.go
index c965731..2df813a 100644 (file)
--- a/account/store.go
+++ b/account/store.go
@@ -20,7 +20,7 @@ type AccountStorer interface {
        DeleteBip44ContractIndex(string)
        DeleteContractIndex(string)
        GetContractIndex(string) uint64
-       GetAccountUTXOs(string) [][]byte
+       DeleteAccountUTXOs(string) error
        DeleteStandardUTXO(bc.Hash)
        GetCoinbaseArbitrary() []byte
        SetCoinbaseArbitrary([]byte)

diff --git a/database/account_store.go b/database/account_store.go
index 78c85d4..6331f7d 100644 (file)
--- a/database/account_store.go
+++ b/database/account_store.go
@@ -162,25 +162,39 @@ func (store *AccountStore) GetContractIndex(accountID string) uint64 {
        return index
 }
 
-// GetAccountUTXOs get account utxos by account id
-func (store *AccountStore) GetAccountUTXOs(accountID string) [][]byte {
+// DeleteStandardUTXO delete utxo by outpu id
+func (store *AccountStore) DeleteStandardUTXO(outputID bc.Hash) {
+       if store.batch == nil {
+               store.accountDB.Delete(StandardUTXOKey(outputID))
+       } else {
+               store.batch.Delete(StandardUTXOKey(outputID))
+       }
+}
+
+// DeleteAccountUTXOs delete account utxos by accountID
+func (store *AccountStore) DeleteAccountUTXOs(accountID string) error {
+       batch := store.accountDB.NewBatch()
+       if store.batch != nil {
+               batch = store.batch
+       }
+
        accountUtxoIter := store.accountDB.IteratorPrefix([]byte(UTXOPrefix))
        defer accountUtxoIter.Release()
 
-       utxos := make([][]byte, 0)
        for accountUtxoIter.Next() {
-               utxos = append(utxos, accountUtxoIter.Value())
+               accountUtxo := &acc.UTXO{}
+               if err := json.Unmarshal(accountUtxoIter.Value(), accountUtxo); err != nil {
+                       return err
+               }
+               if accountID == accountUtxo.AccountID {
+                       batch.Delete(StandardUTXOKey(accountUtxo.OutputID))
+               }
        }
-       return utxos
-}
 
-// DeleteStandardUTXO delete utxo by outpu id
-func (store *AccountStore) DeleteStandardUTXO(outputID bc.Hash) {
        if store.batch == nil {
-               store.accountDB.Delete(StandardUTXOKey(outputID))
-       } else {
-               store.batch.Delete(StandardUTXOKey(outputID))
+               batch.Write()
        }
+       return nil
 }
 
 // GetCoinbaseArbitrary get coinbase arbitrary