[RSC-281] Use UtxoAsBalances to serialize Utxo

Author: gromakovsky

src/RSCoin/Bank/AcidState.hs

@@ -50,34 +50,28 @@ import           Control.Lens                  (Getter, to, view)
 import           Control.Monad.Reader          (ask)
 import           Control.Monad.Trans           (MonadIO)
 import           Data.Acid                     (EventResult, EventState, Query,
-                                                QueryEvent, UpdateEvent,
-                                                makeAcidic)
+                                                QueryEvent, UpdateEvent, makeAcidic)
 import           Data.Aeson                    (encode, object, (.=))
+import           Data.ByteString.Lazy.Char8    as BS hiding (filter, map)
 import           Data.Maybe                    (fromMaybe)
 import qualified Data.Set                      as Set
 import           Data.Text                     (Text)
-import           Data.ByteString.Lazy.Char8    as BS hiding (map, filter)
 import           Formatting                    (bprint, stext, (%))
 import           Safe                          (headMay)
 
-import           Serokell.AcidState            (ExtendedState,
-                                                closeExtendedState,
+import           Serokell.AcidState            (ExtendedState, closeExtendedState,
                                                 openLocalExtendedState,
-                                                openMemoryExtendedState,
-                                                queryExtended,
-                                                tidyExtendedState,
-                                                updateExtended)
-import           Serokell.AcidState.Statistics (StoragePart (..),
-                                                estimateMemoryUsage)
+                                                openMemoryExtendedState, queryExtended,
+                                                tidyExtendedState, updateExtended)
+import           Serokell.AcidState.Statistics (StoragePart (..), estimateMemoryUsage)
 import           Serokell.Data.Memory.Units    (Byte, memory)
 import           Serokell.Util.Text            (listBuilderJSONIndent, show')
 
-import           RSCoin.Core                   (ActionLog,
-                                                AddressToTxStrategyMap,
-                                                Explorer, Explorers, HBlock,
-                                                MintetteId, Mintettes, PeriodId,
-                                                PublicKey)
+import           RSCoin.Core                   (ActionLog, AddressToTxStrategyMap,
+                                                Explorer, Explorers, HBlock, MintetteId,
+                                                Mintettes, PeriodId, PublicKey)
 import qualified RSCoin.Core                   as C
+import           RSCoin.Core.AesonJS           (utxoAsBalances)
 
 import qualified RSCoin.Bank.Storage           as BS
 
@@ -184,7 +178,7 @@ dumpUtxo fp outputFp = do
     state  <- openState False fp
     utxo   <- query state GetUtxo
     BS.writeFile outputFp . encode $ object
-      [ "utxo"   .= utxo
+      [ "utxo"   .= utxoAsBalances utxo
       ]
     pure ()
 

src/RSCoin/Bank/Storage/Storage.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE FlexibleInstances    #-}
-{-# LANGUAGE TypeSynonymInstances #-}
 {-# LANGUAGE TemplateHaskell      #-}
+{-# LANGUAGE TypeSynonymInstances #-}
 
 -- | Storage containing whole bank's data.
 
@@ -24,13 +24,10 @@ module RSCoin.Bank.Storage.Storage
        ) where
 
 import           Control.Lens                  (makeLenses)
-import           Data.Aeson                    (ToJSON, toJSON, object, (.=))
-import qualified Data.HashMap.Strict           as HM
 import           Data.SafeCopy                 (base, deriveSafeCopy)
 import           Data.Typeable                 (Typeable)
 
 import qualified RSCoin.Core                   as C
-import           RSCoin.Core.AesonJS           ()
 
 import qualified RSCoin.Bank.Storage.Addresses as AS
 import qualified RSCoin.Bank.Storage.Explorers as ES
@@ -61,15 +58,6 @@ data Storage = Storage
 $(makeLenses ''Storage)
 $(deriveSafeCopy 0 'base ''Storage)
 
-instance ToJSON C.Utxo where
-    toJSON = toJSON . map toAddrCoin . HM.toList
-        where
-            toAddrCoin ((_, _, coin), addr) =
-                object
-                    [ "address" .= C.getAddress addr
-                    , "coin"    .= coin
-                    ]
-
 -- | Make empty storage
 mkStorage :: Storage
 mkStorage =