[VD-77] Change bank's state JSON serialization format

Author: gromakovsky

rscoin-core

@@ -30,6 +30,7 @@ data Command
     | RemoveExplorer String Int
     | DumpStatistics
     | DumpUtxo FilePath
+    | DumpUtxoOld FilePath
 
 data Options = Options
     { cloCommand        :: Command
@@ -82,7 +83,12 @@ commandParser =
             "dump-state"
             (info
                   dumpStateOpts
-                  (progDesc "Dump current bank state to json")))
+                  (progDesc "Dump current bank state to json")) <>
+         command
+            "dump-state-old"
+            (info
+                  dumpStateOpts
+                  (progDesc "Dump current bank state to json in old format")))
   where
     mHost = strOption (long "host" <> help "Mintette's host" <> metavar "HOST")
     mPort =

src/Bank/BankOptions.hs

@@ -65,6 +65,7 @@ main = do
             B.removeExplorerReq ca bankSecretKey host port
         Opts.DumpStatistics -> B.dumpStatisticsReq ca bankSecretKey
         Opts.DumpUtxo output -> void $ B.dumpUtxo cloPath output
+        Opts.DumpUtxoOld output -> void $ B.dumpUtxoOld cloPath output
         Opts.Serve -> do
             let periodDelta = fromInteger cloPeriodDelta :: Second
             B.launchBankReal cloRebuildDB periodDelta cloPath ca bankSecretKey cloPermittedAddrs

src/Bank/Main.hs

@@ -15,6 +15,7 @@ module RSCoin.Bank.AcidState
        , tidyState
        , update
        , dumpUtxo
+       , dumpUtxoOld
 
          -- | Queries
        , GetMintettes (..)
@@ -71,7 +72,8 @@ import           RSCoin.Core                   (ActionLog, AddressToTxStrategyMa
                                                 Explorer, Explorers, HBlock, MintetteId,
                                                 Mintettes, PeriodId, PublicKey)
 import qualified RSCoin.Core                   as C
-import           RSCoin.Core.AesonJS           (utxoAsBalances)
+import           RSCoin.Core.Aeson             (utxoBalances)
+import           RSCoin.Core.AesonJS           (utxoBalancesJS)
 
 import qualified RSCoin.Bank.Storage           as BS
 
@@ -178,7 +180,16 @@ dumpUtxo fp outputFp = do
     state  <- openState False fp
     utxo   <- query state GetUtxo
     BS.writeFile outputFp . encode $ object
-      [ "utxo"   .= utxoAsBalances utxo
+      [ "utxo"   .= utxoBalances utxo
+      ]
+    pure ()
+
+dumpUtxoOld :: FilePath -> FilePath -> IO ()
+dumpUtxoOld fp outputFp = do
+    state  <- openState False fp
+    utxo   <- query state GetUtxo
+    BS.writeFile outputFp . encode $ object
+      [ "utxo"   .= utxoBalancesJS utxo
       ]
     pure ()