[CDEC-505] Move Pos.Core.Update to Pos.Chain.Update

auxx/cardano-sl-auxx.cabal

@@ -49,6 +49,7 @@ library
                      , canonical-json
                      , cardano-sl
                      , cardano-sl-chain
+                     , cardano-sl-chain-test
                      , cardano-sl-client
                      , cardano-sl-core
                      , cardano-sl-core-test
@@ -187,6 +188,7 @@ test-suite cardano-auxx-test
   build-depends:
                        QuickCheck
                      , cardano-sl-auxx
+                     , cardano-sl-chain
                      , cardano-sl-core
                      , cardano-sl-crypto
                      , hspec

auxx/src/Command/Proc.hs

@@ -20,14 +20,14 @@ import           Pos.Chain.Genesis as Genesis (Config (..), configEpochSlots,
                      configGeneratedSecretsThrow)
 import           Pos.Chain.Genesis (gsSecretKeys)
 import           Pos.Chain.Txp (TxOut (..), TxpConfiguration)
-import           Pos.Chain.Update (BlockVersionModifier (..))
+import           Pos.Chain.Update (BlockVersionModifier (..),
+                     SoftwareVersion (..))
 import           Pos.Client.KeyStorage (addSecretKey, getSecretKeysPlain)
 import           Pos.Client.Txp.Balances (getBalance)
 import           Pos.Core (AddrStakeDistribution (..), StakeholderId,
                      addressHash, mkMultiKeyDistr, unsafeGetCoin)
 import           Pos.Core.Common (AddrAttributes (..), AddrSpendingData (..),
                      makeAddress)
-import           Pos.Core.Update (SoftwareVersion (..))
 import           Pos.Crypto (PublicKey, emptyPassphrase, encToPublic,
                      fullPublicKeyF, hashHexF, noPassEncrypt, safeCreatePsk,
                      unsafeCheatingHashCoerce, withSafeSigner)

auxx/src/Command/Tx.hs

@@ -37,6 +37,7 @@ import           Pos.Chain.Genesis as Genesis (Config (..),
                      configBlockVersionData, configEpochSlots)
 import           Pos.Chain.Txp (TxAux (..), TxIn (TxInUtxo), TxOut (..),
                      TxOutAux (..), topsortTxAuxes, txaF)
+import           Pos.Chain.Update (BlockVersionData (..))
 import           Pos.Client.KeyStorage (getSecretKeysPlain)
 import           Pos.Client.Txp.Balances (getOwnUtxoForPk)
 import           Pos.Client.Txp.Network (prepareMTx, submitTxRaw)
@@ -45,7 +46,6 @@ import           Pos.Core (IsBootstrapEraAddr (..), Timestamp (..),
                      deriveFirstHDAddress, makePubKeyAddress, mkCoin)
 import           Pos.Core.Conc (concurrently, currentTime, delay,
                      forConcurrently, modifySharedAtomic, newSharedAtomic)
-import           Pos.Core.Update (BlockVersionData (..))
 import           Pos.Crypto (EncryptedSecretKey, SecretKey, emptyPassphrase,
                      encToPublic, fakeSigner, hash, safeToPublic, toPublic,
                      withSafeSigners)

auxx/src/Command/TyProjection.hs

@@ -37,12 +37,12 @@ import           Data.Time.Units (Microsecond, TimeUnit, convertUnit,
 import           Serokell.Data.Memory.Units (Byte, fromBytes)
 
 import           Pos.Chain.Txp (TxOut (..))
-import           Pos.Chain.Update (ApplicationName (..),
-                     BlockVersionModifier (..), SystemTag (..))
+import           Pos.Chain.Update (ApplicationName (..), BlockVersion,
+                     BlockVersionModifier (..), SoftwareVersion,
+                     SystemTag (..))
 import           Pos.Core (AddrStakeDistribution (..), Address, Coin,
                      CoinPortion, EpochIndex, ScriptVersion, StakeholderId,
                      mkCoin, unsafeCoinPortionFromDouble, unsafeGetCoin)
-import           Pos.Core.Update (BlockVersion, SoftwareVersion)
 import           Pos.Crypto (AHash (..), Hash, PublicKey)
 
 import           Lang.Argument (TyProjection (..), TypeName (..))

auxx/src/Lang/Lexer.hs

@@ -53,14 +53,15 @@ import           Text.Megaparsec.Char (anyChar, char, satisfy, spaceChar,
 import           Text.Megaparsec.Char.Lexer (decimal, scientific, signed)
 
 import           Lang.Name (Letter, Name (..), unsafeMkLetter)
-import           Pos.Core (Address, StakeholderId, decodeTextAddress)
-import           Pos.Core.Update (ApplicationName (..), BlockVersion (..),
+import           Pos.Chain.Update (ApplicationName (..), BlockVersion (..),
                      SoftwareVersion (..))
+import           Pos.Core (Address, StakeholderId, decodeTextAddress)
 import           Pos.Crypto (AHash (..), PublicKey, decodeAbstractHash,
                      fullPublicKeyF, hashHexF, parseFullPublicKey,
                      unsafeCheatingHashCoerce)
 import           Pos.Util.Util (toParsecError)
 
+import           Test.Pos.Chain.Update.Arbitrary ()
 import           Test.Pos.Core.Arbitrary ()
 
 data BracketSide = BracketSideOpening | BracketSideClosing

auxx/src/Lang/Syntax.hs

@@ -14,8 +14,8 @@ import           Universum
 import           Data.Scientific (Scientific)
 
 import           Lang.Name (Name)
+import           Pos.Chain.Update (BlockVersion, SoftwareVersion)
 import           Pos.Core (Address, StakeholderId)
-import           Pos.Core.Update (BlockVersion, SoftwareVersion)
 import           Pos.Crypto (AHash, PublicKey)
 
 data Expr cmd

auxx/src/Lang/Value.hs

@@ -37,11 +37,10 @@ import           Control.Lens (makePrisms)
 import           Data.Scientific (Scientific)
 
 import           Pos.Chain.Txp (TxOut)
-import           Pos.Chain.Update (BlockVersionData, BlockVersionModifier,
-                     SystemTag)
+import           Pos.Chain.Update (BlockVersion, BlockVersionData,
+                     BlockVersionModifier, SoftwareVersion, SystemTag)
 import           Pos.Core (AddrStakeDistribution, Address, CoinPortion,
                      StakeholderId)
-import           Pos.Core.Update (BlockVersion, SoftwareVersion)
 import           Pos.Crypto (AHash, PublicKey)
 
 data AddrDistrPart = AddrDistrPart

auxx/test/Test/Auxx/Lang/LexerSpec.hs

@@ -8,9 +8,9 @@ import           Test.Hspec (Expectation, Spec, describe, it, shouldBe)
 import           Test.Hspec.QuickCheck (prop)
 import           Test.QuickCheck (Property, property)
 
-import           Pos.Core (decodeTextAddress)
-import           Pos.Core.Update (ApplicationName (..), BlockVersion (..),
+import           Pos.Chain.Update (ApplicationName (..), BlockVersion (..),
                      SoftwareVersion (..))
+import           Pos.Core (decodeTextAddress)
 import           Pos.Crypto (decodeAbstractHash, parseFullPublicKey,
                      unsafeCheatingHashCoerce)
 

chain/bench/block-bench.hs

@@ -18,7 +18,7 @@ import           Pos.Chain.Block (Body, BodyProof, ConsensusData, ExtraBodyData,
 import           Pos.Chain.Delegation (DlgPayload)
 import           Pos.Chain.Ssc (SscPayload)
 import           Pos.Chain.Txp (TxPayload (..))
-import           Pos.Core.Update (UpdatePayload)
+import           Pos.Chain.Update (UpdatePayload)
 import           Pos.Crypto (ProtocolMagic (..))
 
 import           Test.Pos.Chain.Block.Arbitrary.Generate (generateMainBlock)

chain/cardano-sl-chain.cabal

@@ -138,15 +138,25 @@ library
                        Pos.Chain.Ssc.VssCertificate
                        Pos.Chain.Ssc.VssCertificatesMap
 
+                       Pos.Chain.Update.ApplicationName
                        Pos.Chain.Update.BlockVersion
+                       Pos.Chain.Update.BlockVersionData
+                       Pos.Chain.Update.BlockVersionModifier
                        Pos.Chain.Update.Configuration
                        Pos.Chain.Update.Constants
+                       Pos.Chain.Update.Data
+                       Pos.Chain.Update.Params
+                       Pos.Chain.Update.Payload
                        Pos.Chain.Update.Poll
                        Pos.Chain.Update.Poll.Class
                        Pos.Chain.Update.Poll.Modifier
                        Pos.Chain.Update.Poll.Types
                        Pos.Chain.Update.Poll.Failure
-                       Pos.Chain.Update.Params
+                       Pos.Chain.Update.Proof
+                       Pos.Chain.Update.SoftforkRule
+                       Pos.Chain.Update.SoftwareVersion
+                       Pos.Chain.Update.SystemTag
+                       Pos.Chain.Update.Vote
 
   build-depends:       Cabal
                      , aeson
@@ -264,7 +274,11 @@ test-suite test
                        Test.Pos.Chain.Txp.Example
                        Test.Pos.Chain.Txp.Toil.UtxoSpec
                        Test.Pos.Chain.Update.Arbitrary
-                       Test.Pos.Chain.Update.Arbitrary.Core
+                       Test.Pos.Chain.Update.Bi
+                       Test.Pos.Chain.Update.CborSpec
+                       Test.Pos.Chain.Update.Example
+                       Test.Pos.Chain.Update.Gen
+                       Test.Pos.Chain.Update.Json
 
   build-depends:       base
                      , base16-bytestring
@@ -293,6 +307,7 @@ test-suite test
                      , random
                      , serokell-util
                      , formatting
+                     , time-units
                      , universum
                      , unordered-containers
                      , vector
@@ -316,7 +331,6 @@ benchmark block-bench
                        Test.Pos.Chain.Ssc.Arbitrary
                        Test.Pos.Chain.Txp.Arbitrary
                        Test.Pos.Chain.Update.Arbitrary
-                       Test.Pos.Chain.Update.Arbitrary.Core
 
   ghc-options:         -Wall -O2
   build-depends:       QuickCheck

chain/src/Pos/Chain/Block/BHelpers.hs

@@ -34,8 +34,8 @@ import           Pos.Chain.Delegation (LightDlgIndices (..), checkDlgPayload)
 import           Pos.Chain.Genesis as Genesis (Config (..))
 import           Pos.Chain.Ssc (checkSscPayload, verifySscPayload)
 import           Pos.Chain.Txp (checkTxPayload)
+import           Pos.Chain.Update (checkSoftwareVersion, checkUpdatePayload)
 import           Pos.Core.Slotting (SlotId (..))
-import           Pos.Core.Update (checkSoftwareVersion, checkUpdatePayload)
 import           Pos.Crypto (ProtocolMagic, ProxySignature (..), SignTag (..),
                      checkSig, hash, isSelfSignedPsk, proxyVerify)
 import           Pos.Util.Some (Some (Some))

chain/src/Pos/Chain/Block/Constructors.hs

@@ -25,11 +25,11 @@ import           Pos.Chain.Block.Union (BlockHeader, BlockSignature (..),
                      headerHash)
 import           Pos.Chain.Delegation (ProxySKBlockInfo)
 import           Pos.Chain.Genesis (GenesisHash (..))
+import           Pos.Chain.Update (BlockVersion, SoftwareVersion)
 import           Pos.Core.Attributes (mkAttributes)
 import           Pos.Core.Common (ChainDifficulty, HasDifficulty (..),
                      SlotLeaders)
 import           Pos.Core.Slotting (EpochIndex, SlotId)
-import           Pos.Core.Update (BlockVersion, SoftwareVersion)
 import           Pos.Crypto (ProtocolMagic, SecretKey, SignTag (..), hash,
                      proxySign, sign, toPublic)
 

chain/src/Pos/Chain/Block/Logic/Integrity.hs

@@ -35,13 +35,13 @@ import           Pos.Chain.Block.Union (Block, BlockHeader (..),
                      getBlockHeader, headerSlotL, mainHeaderLeaderKey,
                      mebAttributes, mehAttributes, prevBlockL)
 import           Pos.Chain.Genesis as Genesis (Config (..))
+import           Pos.Chain.Update (BlockVersionData (..))
 import           Pos.Core (ChainDifficulty, EpochOrSlot, HasDifficulty (..),
                      HasEpochIndex (..), HasEpochOrSlot (..), SlotId (..),
                      SlotLeaders, addressHash, getSlotIndex)
 import           Pos.Core.Attributes (areAttributesKnown)
 import           Pos.Core.Chrono (NewestFirst (..), OldestFirst)
 import           Pos.Core.Slotting (EpochIndex)
-import           Pos.Core.Update (BlockVersionData (..))
 import           Pos.Crypto (ProtocolMagic (..))
 
 ----------------------------------------------------------------------------

chain/src/Pos/Chain/Block/Main/Instances.hs

@@ -25,9 +25,10 @@ import           Pos.Chain.Block.Union.Types (BlockHeader (..),
                      mainHeaderLeaderKey, mainHeaderSlot,
                      mainHeaderSoftwareVersion, mbTxs, mcdDifficulty,
                      mehBlockVersion, mehSoftwareVersion)
+import           Pos.Chain.Update.BlockVersion (HasBlockVersion (..))
+import           Pos.Chain.Update.SoftwareVersion (HasSoftwareVersion (..))
 import           Pos.Core.Common (HasDifficulty (..))
 import           Pos.Core.Slotting (HasEpochIndex (..), HasEpochOrSlot (..))
-import           Pos.Core.Update (HasBlockVersion (..), HasSoftwareVersion (..))
 
 instance NFData MainBlock
 

chain/src/Pos/Chain/Block/Main/Types.hs

@@ -27,9 +27,11 @@ import           Pos.Chain.Ssc.Payload (SscPayload)
 import           Pos.Chain.Ssc.Proof (SscProof)
 import           Pos.Chain.Txp.TxPayload (TxPayload)
 import           Pos.Chain.Txp.TxProof (TxProof)
+import           Pos.Chain.Update.BlockVersion (BlockVersion)
+import           Pos.Chain.Update.Payload (UpdatePayload)
+import           Pos.Chain.Update.Proof (UpdateProof)
+import           Pos.Chain.Update.SoftwareVersion (SoftwareVersion)
 import           Pos.Core.Attributes (Attributes, areAttributesKnown)
-import           Pos.Core.Update (BlockVersion, SoftwareVersion, UpdatePayload,
-                     UpdateProof)
 import           Pos.Crypto (Hash)
 
 -- | Proof of everything contained in the payload.

chain/src/Pos/Chain/Block/Union/Types.hs

@@ -137,12 +137,15 @@ import           Pos.Chain.Txp.Tx (Tx)
 import           Pos.Chain.Txp.TxPayload (TxPayload, txpTxs, txpWitnesses)
 import           Pos.Chain.Txp.TxProof (mkTxProof)
 import           Pos.Chain.Txp.TxWitness (TxWitness)
+import           Pos.Chain.Update.BlockVersion (BlockVersion,
+                     HasBlockVersion (..))
+import           Pos.Chain.Update.Payload (UpdatePayload)
+import           Pos.Chain.Update.Proof (mkUpdateProof)
+import           Pos.Chain.Update.SoftwareVersion (HasSoftwareVersion (..),
+                     SoftwareVersion)
 import           Pos.Core.Common (ChainDifficulty, HasDifficulty (..))
 import           Pos.Core.Slotting (EpochOrSlot (..), HasEpochIndex (..),
                      HasEpochOrSlot (..), SlotId (..), slotIdF)
-import           Pos.Core.Update (BlockVersion, HasBlockVersion (..),
-                     HasSoftwareVersion (..), SoftwareVersion, UpdatePayload,
-                     mkUpdateProof)
 import           Pos.Crypto (Hash, ProtocolMagic, PublicKey, Signature, hash,
                      hashHexF, unsafeHash)
 import           Pos.Util.Some (Some, applySome, liftLensSome)

chain/src/Pos/Chain/Genesis/Config.hs

@@ -64,12 +64,12 @@ import           Pos.Chain.Genesis.ProtocolConstants
 import           Pos.Chain.Genesis.Spec (GenesisSpec (..))
 import           Pos.Chain.Genesis.WStakeholders (GenesisWStakeholders)
 import           Pos.Chain.Ssc.VssCertificatesMap (VssCertificatesMap)
+import           Pos.Chain.Update (BlockVersionData)
 import           Pos.Core.Common (BlockCount, SharedSeed)
 import           Pos.Core.ProtocolConstants (ProtocolConstants (..),
                      pcBlkSecurityParam, pcChainQualityThreshold, pcEpochSlots,
                      pcSlotSecurityParam, vssMaxTTL, vssMinTTL)
 import           Pos.Core.Slotting (SlotCount, Timestamp)
-import           Pos.Core.Update (BlockVersionData)
 import           Pos.Crypto (ProtocolMagic)
 import           Pos.Crypto.Hashing (Hash, hashRaw, unsafeHash)
 import           Pos.Util.Json.Canonical (SchemaError)

chain/src/Pos/Chain/Genesis/Data.hs

@@ -11,9 +11,9 @@ import           Text.JSON.Canonical (FromJSON (..), ToJSON (..), fromJSField,
                      mkObject)
 
 import           Pos.Chain.Ssc.VssCertificatesMap (VssCertificatesMap)
+import           Pos.Chain.Update (BlockVersionData)
 import           Pos.Core.Common (SharedSeed)
 import           Pos.Core.Slotting (Timestamp)
-import           Pos.Core.Update (BlockVersionData)
 
 import           Pos.Chain.Genesis.AvvmBalances
 import           Pos.Chain.Genesis.Delegation

chain/src/Pos/Chain/Genesis/Spec.hs

@@ -11,8 +11,8 @@ import           Data.Aeson.TH (deriveJSON)
 import qualified Data.HashMap.Strict as HM
 import           Serokell.Util (allDistinct)
 
+import           Pos.Chain.Update (BlockVersionData)
 import           Pos.Core.Common (SharedSeed)
-import           Pos.Core.Update (BlockVersionData)
 
 import           Pos.Chain.Genesis.AvvmBalances
 import           Pos.Chain.Genesis.Delegation

chain/src/Pos/Chain/Ssc/Toss/Base.hs

@@ -65,9 +65,9 @@ import           Pos.Chain.Ssc.Toss.Class (MonadToss (..), MonadTossEnv (..),
 import           Pos.Chain.Ssc.VssCertificate (vcSigningKey, vcVssKey)
 import           Pos.Chain.Ssc.VssCertificatesMap (VssCertificatesMap (..),
                      lookupVss, memberVss)
+import           Pos.Chain.Update (bvdMpcThd)
 import           Pos.Core (CoinPortion, EpochIndex, StakeholderId, addressHash,
                      coinPortionDenominator, getCoinPortion, unsafeGetCoin)
-import           Pos.Core.Update (bvdMpcThd)
 import           Pos.Crypto (DecShare, verifyDecShare, verifyEncShares)
 import           Pos.Util.Util (getKeys)
 import           Pos.Util.Wlog (logWarning)

chain/src/Pos/Chain/Ssc/Toss/Class.hs

@@ -22,8 +22,8 @@ import           Pos.Chain.Ssc.OpeningsMap (OpeningsMap)
 import           Pos.Chain.Ssc.SharesMap (InnerSharesMap, SharesMap)
 import           Pos.Chain.Ssc.VssCertificate (VssCertificate)
 import           Pos.Chain.Ssc.VssCertificatesMap (VssCertificatesMap)
+import           Pos.Chain.Update (BlockVersionData)
 import           Pos.Core (EpochIndex, EpochOrSlot, StakeholderId)
-import           Pos.Core.Update (BlockVersionData)
 import           Pos.Util.Wlog (WithLogger)
 
 ----------------------------------------------------------------------------

chain/src/Pos/Chain/Ssc/Toss/Pure.hs

@@ -26,8 +26,8 @@ import           Pos.Chain.Ssc.Toss.Class (MonadToss (..), MonadTossEnv (..),
 import           Pos.Chain.Ssc.Types (SscGlobalState, sgsCommitments,
                      sgsOpenings, sgsShares, sgsVssCertificates)
 import qualified Pos.Chain.Ssc.VssCertData as VCD
+import           Pos.Chain.Update (BlockVersionData)
 import           Pos.Core (EpochIndex)
-import           Pos.Core.Update (BlockVersionData)
 import           Pos.Util.Wlog (CanLog, HasLoggerName (..), LogEvent,
                      NamedPureLogger (..), WithLogger, dispatchEvents,
                      runNamedPureLog)

chain/src/Pos/Chain/Txp/Toil/Logic.hs

@@ -37,13 +37,13 @@ import           Pos.Chain.Txp.Tx (Tx (..), TxId, TxOut (..), txOutAddress)
 import           Pos.Chain.Txp.TxAux (TxAux (..), checkTxAux)
 import           Pos.Chain.Txp.TxOutAux (toaOut)
 import           Pos.Chain.Txp.Undo (TxUndo, TxpUndo)
+import           Pos.Chain.Update (BlockVersionData (..), isBootstrapEraBVD)
 import           Pos.Core (AddrAttributes (..), AddrStakeDistribution (..),
                      Address, EpochIndex, addrAttributesUnwrapped,
                      isRedeemAddress)
 import           Pos.Core.Common (integerToCoin)
 import qualified Pos.Core.Common as Fee (TxFeePolicy (..),
                      calculateTxSizeLinear)
-import           Pos.Core.Update (BlockVersionData (..), isBootstrapEraBVD)
 import           Pos.Crypto (ProtocolMagic, WithHash (..), hash)
 import           Pos.Util (liftEither)
 

chain/src/Pos/Chain/Update.hs

@@ -1,23 +1,25 @@
--- | Update system reexports. (Except for "Pos.Chain.Update.DB".)
-
 module Pos.Chain.Update
-       ( module Pos.Core.Update
-       , module Pos.Chain.Update.BlockVersion
-       , module Pos.Chain.Update.Configuration
-       , module Pos.Chain.Update.Constants
-       , module Pos.Chain.Update.Params
-       , module Pos.Chain.Update.Poll
+       ( module X
 
        , BlockVersionState (..)
        , PollModifier (..)
        ) where
 
-import           Pos.Chain.Update.BlockVersion
-import           Pos.Chain.Update.Configuration
-import           Pos.Chain.Update.Constants
-import           Pos.Chain.Update.Params
-import           Pos.Chain.Update.Poll
-import           Pos.Core.Update
+import           Pos.Chain.Update.ApplicationName as X
+import           Pos.Chain.Update.BlockVersion as X
+import           Pos.Chain.Update.BlockVersionData as X
+import           Pos.Chain.Update.BlockVersionModifier as X
+import           Pos.Chain.Update.Configuration as X
+import           Pos.Chain.Update.Constants as X
+import           Pos.Chain.Update.Data as X
+import           Pos.Chain.Update.Params as X
+import           Pos.Chain.Update.Payload as X
+import           Pos.Chain.Update.Poll as X
+import           Pos.Chain.Update.Proof as X
+import           Pos.Chain.Update.SoftforkRule as X
+import           Pos.Chain.Update.SoftwareVersion as X
+import           Pos.Chain.Update.SystemTag as X
+import           Pos.Chain.Update.Vote as X
 
 import           Pos.Chain.Update.Poll.Modifier (PollModifier (..))
 import           Pos.Chain.Update.Poll.Types (BlockVersionState (..))