[CDEC-509] Remove CoreConfiguration and update configuration.yaml

input-output-hk · Sep 11, 2018 · 88e42a2 · 88e42a2
1 parent 42a9b8e
commit 88e42a2
Show file tree

Hide file tree

Showing 7 changed files with 14,708 additions and 14,763 deletions.
diff --git a/core/src/Pos/Core/Configuration.hs b/core/src/Pos/Core/Configuration.hs
@@ -24,7 +24,7 @@ module Pos.Core.Configuration
        , configFtsSeed
 
        , ConfigurationError (..)
-       , withCoreConfigurations
+       , configFromGenesisConfig
        , mkConfig
 
        , canonicalGenesisJson
@@ -157,20 +157,19 @@ prettyGenesisJson theGenesisData =
 --
 -- If the configuration gives a testnet genesis spec, then a start time must
 -- be provided, probably sourced from command line arguments.
-withCoreConfigurations
+configFromGenesisConfig
     :: (MonadThrow m, MonadIO m)
-    => CoreConfiguration
-    -- ^ Update @'GenesisData'@ before passing its parts to @'given'@.
-    -> FilePath
+    => FilePath
     -- ^ Directory where 'configuration.yaml' is stored.
     -> Maybe Timestamp
     -- ^ Optional system start time.
     --   It must be given when the genesis spec uses a testnet initializer.
     -> Maybe Integer
     -- ^ Optional seed which overrides one from testnet initializer if
     -- provided.
+    -> GenesisConfiguration
     -> m Config
-withCoreConfigurations conf confDir mSystemStart mSeed = case ccGenesis conf of
+configFromGenesisConfig confDir mSystemStart mSeed = \case
     -- If a 'GenesisData' source file is given, we check its hash against the
     -- given expected hash, parse it, and use the GenesisData to fill in all of
     -- the obligations.
@@ -225,10 +224,7 @@ withCoreConfigurations conf confDir mSystemStart mSeed = case ccGenesis conf of
 
         pure $ mkConfig theSystemStart theSpec
 
-mkConfig
-    :: Timestamp
-    -> GenesisSpec
-    -> Config
+mkConfig :: Timestamp -> GenesisSpec -> Config
 mkConfig theSystemStart spec = Config
     { configProtocolMagic     = pm
     , configProtocolConstants = pc

diff --git a/core/src/Pos/Core/Configuration/Core.hs b/core/src/Pos/Core/Configuration/Core.hs
@@ -2,10 +2,7 @@
 {-# LANGUAGE Rank2Types  #-}
 
 module Pos.Core.Configuration.Core
-       (
-       -- * The configuration structure
-         CoreConfiguration(..)
-       , GenesisConfiguration(..)
+       ( GenesisConfiguration(..)
        ) where
 
 import           Prelude
@@ -15,7 +12,6 @@ import           Data.Aeson (FromJSON, ToJSON, Value (..), genericToEncoding,
                      pairs, parseJSON, toEncoding, (.:))
 import           Data.Aeson.Encoding (pairStr)
 import           Data.Aeson.Options (defaultOptions)
-import           Data.Aeson.TH (deriveJSON)
 import           Data.Aeson.Types (typeMismatch)
 import qualified Data.HashMap.Strict as HM
 import           Data.Monoid ((<>))
@@ -97,16 +93,3 @@ instance FromJSON GenesisConfiguration where
         | otherwise = fail "Incorrect JSON encoding for GenesisConfiguration"
 
     parseJSON invalid = typeMismatch "GenesisConfiguration" invalid
-
-data CoreConfiguration = CoreConfiguration
-    {
-      -- | Specifies the genesis
-      ccGenesis            :: !GenesisConfiguration
-
-      -- | Versioning for values in node's DB
-    , ccDbSerializeVersion :: !Word8
-
-    }
-    deriving (Show, Generic)
-
-deriveJSON defaultOptions ''CoreConfiguration
diff --git a/core/test/Test/Pos/Core/Dummy.hs b/core/test/Test/Pos/Core/Dummy.hs
@@ -16,7 +16,6 @@ module Test.Pos.Core.Dummy
        , dummyGenesisSecretKeysPoor
        , dummyGenesisSecretsRich
        , dummyGenesisSecretsPoor
-       , dummyCoreConfiguration
        , dummyGenesisSpec
        , dummyBlockVersionData
        , dummyGenesisData
@@ -26,11 +25,9 @@ module Test.Pos.Core.Dummy
 
 import           Universum
 
-import           Pos.Core (BlockCount, Coeff (..), Config (..),
-                     CoreConfiguration (..), EpochIndex (..),
-                     GenesisConfiguration (..), GenesisHash (..),
-                     ProtocolConstants (..), SharedSeed (..), SlotCount,
-                     Timestamp, TxFeePolicy (..), TxSizeLinear (..),
+import           Pos.Core (BlockCount, Coeff (..), Config (..), EpochIndex (..),
+                     GenesisHash (..), ProtocolConstants (..), SharedSeed (..),
+                     SlotCount, Timestamp, TxFeePolicy (..), TxSizeLinear (..),
                      VssMaxTTL (..), VssMinTTL (..), kEpochSlots,
                      kSlotSecurityParam, mkConfig, pcBlkSecurityParam,
                      unsafeCoinPortionFromDouble)
@@ -94,13 +91,6 @@ dummyGenesisSecretKeysRich = gsSecretKeysRich dummyGeneratedSecrets
 dummyGenesisSecretKeysPoor :: [SecretKey]
 dummyGenesisSecretKeysPoor = gsSecretKeysPoor dummyGeneratedSecrets
 
-dummyCoreConfiguration :: CoreConfiguration
-dummyCoreConfiguration =
-    CoreConfiguration (GCSpec dummyGenesisSpec) dummyDbSerializeVersion
-
-dummyDbSerializeVersion :: Word8
-dummyDbSerializeVersion = 0
-
 dummyGenesisSpec :: GenesisSpec
 dummyGenesisSpec = UnsafeGenesisSpec
     dummyGenesisAvvmBalances

diff --git a/core/test/Test/Pos/Core/Gen.hs b/core/test/Test/Pos/Core/Gen.hs
@@ -24,7 +24,6 @@ module Test.Pos.Core.Gen
 
         -- Pos.Core.Configuration Generators
         , genGenesisConfiguration
-        , genCoreConfiguration
 
         -- Pos.Core.Delegation Generators
         , genDlgPayload
@@ -137,8 +136,8 @@ import           Pos.Core.Common (AddrAttributes (..), AddrSpendingData (..),
                      StakesMap, TxFeePolicy (..), TxSizeLinear (..),
                      coinPortionDenominator, makeAddress, maxCoinVal,
                      mkMultiKeyDistr)
-import           Pos.Core.Configuration (CoreConfiguration (..),
-                     GenesisConfiguration (..), GenesisHash (..))
+import           Pos.Core.Configuration (GenesisConfiguration (..),
+                     GenesisHash (..))
 import           Pos.Core.Delegation (DlgPayload (..), HeavyDlgIndex (..),
                      LightDlgIndices (..), ProxySKBlockInfo, ProxySKHeavy)
 import           Pos.Core.Genesis (FakeAvvmOptions (..),
@@ -337,12 +336,6 @@ genGenesisConfiguration pm =
                , GCSpec <$> genGenesisSpec pm
                ]
 
-genCoreConfiguration :: ProtocolMagic -> Gen CoreConfiguration
-genCoreConfiguration pm =
-    CoreConfiguration
-        <$> genGenesisConfiguration pm
-        <*> genWord8
-
 ----------------------------------------------------------------------------
 -- Pos.Core.Delegation Generators
 ----------------------------------------------------------------------------
@@ -776,9 +769,6 @@ genMicrosecond = fromMicroseconds <$> Gen.integral (Range.constant 0 1000000)
 genWord32 :: Gen Word32
 genWord32 = Gen.word32 Range.constantBounded
 
-genWord8 :: Gen Word8
-genWord8 = Gen.word8 Range.constantBounded
-
 genWord16 :: Gen Word16
 genWord16 = Gen.word16 Range.constantBounded