[Chore] Delete InitialStorageData and mkInitialStorage

Problem: we have a data type we only use once in exactly one place, and
a function that immediately consume it. There's no need for this.

Solution: Inline `mkInitialStorage`

Author: dcastro

haskell/src/Stablecoin/Client.hs

@@ -3,7 +3,7 @@
 
 module Stablecoin.Client
   ( module Stablecoin.Client.Impl
-  , InitialStorageData(..)
+  , InitialStorageOptions(..)
   , Alias
   ) where
 

haskell/src/Stablecoin/Client/Contract.hs

@@ -3,14 +3,9 @@
 
 module Stablecoin.Client.Contract
   ( InitialStorageOptions(..)
-  , InitialStorageData(..)
-  , mkInitialStorage
   ) where
 
-import Lorentz as L
-import Lorentz.Contracts.Spec.TZIP16Interface (MetadataMap)
-import Lorentz.Contracts.Stablecoin (Expiry, Roles(..), Storage(..))
-import Morley.Tezos.Address (ContractAddress, L1Address)
+import Lorentz.Contracts.Stablecoin (Expiry)
 import Stablecoin.Client.L1AddressOrAlias (ContractAddressOrAlias, L1AddressOrAlias)
 import Stablecoin.Client.Parser (ContractMetadataOptions(..))
 
@@ -26,38 +21,3 @@ data InitialStorageOptions = InitialStorageOptions
   , isoContractMetadataStorage :: ContractMetadataOptions
   , isoDefaultExpiry :: Expiry
   }
-
--- | The data needed in order to create the stablecoin contract's initial storage.
-data InitialStorageData = InitialStorageData
-  { isdMasterMinter :: L1Address
-  , isdContractOwner :: L1Address
-  , isdPauser :: L1Address
-  , isdTransferlist :: Maybe ContractAddress
-  , isdTokenSymbol :: Text
-  , isdTokenName :: Text
-  , isdTokenDecimals :: Natural
-  , isdContractMetadataStorage :: MetadataMap
-  , isdDefaultExpiry :: Expiry
-  }
-
--- | Construct the stablecoin contract's initial storage in order to deploy it.
-mkInitialStorage :: InitialStorageData -> Storage
-mkInitialStorage InitialStorageData {..} =
-  Storage
-    { sDefaultExpiry = isdDefaultExpiry
-    , sLedger = def
-    , sMintingAllowances = mempty
-    , sOperators = def
-    , sPaused = False
-    , sPermitCounter = 0
-    , sPermits = def
-    , sRoles = Roles
-        { rMasterMinter = toAddress isdMasterMinter
-        , rOwner = toAddress isdContractOwner
-        , rPauser = toAddress isdPauser
-        , rPendingOwner = Nothing
-        }
-    , sTransferlistContract = toAddress <$> isdTransferlist
-    , sMetadata = isdContractMetadataStorage
-    , sTotalSupply = 0
-    }

haskell/src/Stablecoin/Client/Impl.hs

@@ -56,6 +56,7 @@ import Morley.Tezos.Address
   (Address, ConstrainedAddress(..), ContractAddress, KindedAddress(..), L1Address, TxRollupAddress)
 import Morley.Tezos.Address.Alias (AddressOrAlias(..), Alias(..), ContractAlias, unAlias)
 import Morley.Tezos.Core (Mutez, zeroMutez)
+import Morley.Util.Default (def)
 import Morley.Util.Interpolate (itu)
 import Morley.Util.Named (arg, pattern (:!), (:!))
 
@@ -65,8 +66,7 @@ import Lorentz.Contracts.Stablecoin
   Roles(..), Storage(..), StorageRPC(..), UpdateOperatorData(..), contractMetadataContract,
   metadataJSON, metadataMap, mkContractMetadataRegistryStorage, parseMetadataUri,
   stablecoinContract)
-import Stablecoin.Client.Contract
-  (InitialStorageData(..), InitialStorageOptions(..), mkInitialStorage)
+import Stablecoin.Client.Contract (InitialStorageOptions(..))
 import Stablecoin.Client.L1AddressOrAlias
 import Stablecoin.Client.Metadata (ViewParam(..), callOffChainView)
 import Stablecoin.Client.Parser (ContractMetadataOptions(..))
@@ -120,19 +120,25 @@ deploy (arg #sender -> sender) alias InitialStorageOptions {..} = do
           Nothing
         pure $ RemoteContract contractMetadataRegistryAddress
 
-  let initialStorageData = InitialStorageData
-            { isdMasterMinter = masterMinter
-            , isdContractOwner = contractOwner
-            , isdPauser = pauser
-            , isdTransferlist = transferlist
-            , isdContractMetadataStorage = metadataMap contractMetadataUri
-            , isdTokenSymbol = isoTokenSymbol
-            , isdTokenName = isoTokenName
-            , isdTokenDecimals = isoTokenDecimals
-            , isdDefaultExpiry = isoDefaultExpiry
-            }
-
-  let initialStorage = mkInitialStorage initialStorageData
+  let initialStorage =
+        Storage
+          { sDefaultExpiry = isoDefaultExpiry
+          , sLedger = def
+          , sMintingAllowances = mempty
+          , sOperators = def
+          , sPaused = False
+          , sPermitCounter = 0
+          , sPermits = def
+          , sRoles = Roles
+              { rMasterMinter = toAddress masterMinter
+              , rOwner = toAddress contractOwner
+              , rPauser = toAddress pauser
+              , rPendingOwner = Nothing
+              }
+          , sTransferlistContract = toAddress <$> transferlist
+          , sMetadata = metadataMap contractMetadataUri
+          , sTotalSupply = 0
+          }
 
   let cmdAddress = case contractMetadataUri of
         RemoteContract addr -> Just addr