Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Commit fba6bc9

Browse files
ruhatchruhatch
committed
[CDEC-505] Move Pos.Core.Update to Pos.Chain.Update
1 parent 76bea25 commit fba6bc9

File tree

174 files changed

+1160
-1719
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+1160
-1719
lines changed

‎auxx/cardano-sl-auxx.cabal‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ library
4949
, canonical-json
5050
, cardano-sl
5151
, cardano-sl-chain
52+
, cardano-sl-chain-test
5253
, cardano-sl-client
5354
, cardano-sl-core
5455
, cardano-sl-core-test
@@ -187,6 +188,7 @@ test-suite cardano-auxx-test
187188
build-depends:
188189
QuickCheck
189190
, cardano-sl-auxx
191+
, cardano-sl-chain
190192
, cardano-sl-core
191193
, cardano-sl-crypto
192194
, hspec

‎auxx/src/Command/Proc.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ import Pos.Chain.Genesis as Genesis (Config (..), configEpochSlots,
2020
configGeneratedSecretsThrow)
2121
import Pos.Chain.Genesis (gsSecretKeys)
2222
import Pos.Chain.Txp (TxOut (..), TxpConfiguration)
23-
import Pos.Chain.Update (BlockVersionModifier (..))
23+
import Pos.Chain.Update (BlockVersionModifier (..),
24+
SoftwareVersion (..))
2425
import Pos.Client.KeyStorage (addSecretKey, getSecretKeysPlain)
2526
import Pos.Client.Txp.Balances (getBalance)
2627
import Pos.Core (AddrStakeDistribution (..), StakeholderId,
2728
addressHash, mkMultiKeyDistr, unsafeGetCoin)
2829
import Pos.Core.Common (AddrAttributes (..), AddrSpendingData (..),
2930
makeAddress)
30-
import Pos.Core.Update (SoftwareVersion (..))
3131
import Pos.Crypto (PublicKey, emptyPassphrase, encToPublic,
3232
fullPublicKeyF, hashHexF, noPassEncrypt, safeCreatePsk,
3333
unsafeCheatingHashCoerce, withSafeSigner)

‎auxx/src/Command/Tx.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import Pos.Chain.Genesis as Genesis (Config (..),
3737
configBlockVersionData, configEpochSlots)
3838
import Pos.Chain.Txp (TxAux (..), TxIn (TxInUtxo), TxOut (..),
3939
TxOutAux (..), topsortTxAuxes, txaF)
40+
import Pos.Chain.Update (BlockVersionData (..))
4041
import Pos.Client.KeyStorage (getSecretKeysPlain)
4142
import Pos.Client.Txp.Balances (getOwnUtxoForPk)
4243
import Pos.Client.Txp.Network (prepareMTx, submitTxRaw)
@@ -45,7 +46,6 @@ import Pos.Core (IsBootstrapEraAddr (..), Timestamp (..),
4546
deriveFirstHDAddress, makePubKeyAddress, mkCoin)
4647
import Pos.Core.Conc (concurrently, currentTime, delay,
4748
forConcurrently, modifySharedAtomic, newSharedAtomic)
48-
import Pos.Core.Update (BlockVersionData (..))
4949
import Pos.Crypto (EncryptedSecretKey, SecretKey, emptyPassphrase,
5050
encToPublic, fakeSigner, hash, safeToPublic, toPublic,
5151
withSafeSigners)

‎auxx/src/Command/TyProjection.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ import Data.Time.Units (Microsecond, TimeUnit, convertUnit,
3737
import Serokell.Data.Memory.Units (Byte, fromBytes)
3838

3939
import Pos.Chain.Txp (TxOut (..))
40-
import Pos.Chain.Update (ApplicationName (..),
41-
BlockVersionModifier (..), SystemTag (..))
40+
import Pos.Chain.Update (ApplicationName (..), BlockVersion,
41+
BlockVersionModifier (..), SoftwareVersion,
42+
SystemTag (..))
4243
import Pos.Core (AddrStakeDistribution (..), Address, Coin,
4344
CoinPortion, EpochIndex, ScriptVersion, StakeholderId,
4445
mkCoin, unsafeCoinPortionFromDouble, unsafeGetCoin)
45-
import Pos.Core.Update (BlockVersion, SoftwareVersion)
4646
import Pos.Crypto (AHash (..), Hash, PublicKey)
4747

4848
import Lang.Argument (TyProjection (..), TypeName (..))

‎auxx/src/Lang/Lexer.hs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,15 @@ import Text.Megaparsec.Char (anyChar, char, satisfy, spaceChar,
5353
import Text.Megaparsec.Char.Lexer (decimal, scientific, signed)
5454

5555
import Lang.Name (Letter, Name (..), unsafeMkLetter)
56-
import Pos.Core (Address, StakeholderId, decodeTextAddress)
57-
import Pos.Core.Update (ApplicationName (..), BlockVersion (..),
56+
import Pos.Chain.Update (ApplicationName (..), BlockVersion (..),
5857
SoftwareVersion (..))
58+
import Pos.Core (Address, StakeholderId, decodeTextAddress)
5959
import Pos.Crypto (AHash (..), PublicKey, decodeAbstractHash,
6060
fullPublicKeyF, hashHexF, parseFullPublicKey,
6161
unsafeCheatingHashCoerce)
6262
import Pos.Util.Util (toParsecError)
6363

64+
import Test.Pos.Chain.Update.Arbitrary ()
6465
import Test.Pos.Core.Arbitrary ()
6566

6667
data BracketSide = BracketSideOpening | BracketSideClosing

‎auxx/src/Lang/Syntax.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import Universum
1414
import Data.Scientific (Scientific)
1515

1616
import Lang.Name (Name)
17+
import Pos.Chain.Update (BlockVersion, SoftwareVersion)
1718
import Pos.Core (Address, StakeholderId)
18-
import Pos.Core.Update (BlockVersion, SoftwareVersion)
1919
import Pos.Crypto (AHash, PublicKey)
2020

2121
data Expr cmd

‎auxx/src/Lang/Value.hs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,10 @@ import Control.Lens (makePrisms)
3737
import Data.Scientific (Scientific)
3838

3939
import Pos.Chain.Txp (TxOut)
40-
import Pos.Chain.Update (BlockVersionData, BlockVersionModifier,
41-
SystemTag)
40+
import Pos.Chain.Update (BlockVersion, BlockVersionData,
41+
BlockVersionModifier, SoftwareVersion, SystemTag)
4242
import Pos.Core (AddrStakeDistribution, Address, CoinPortion,
4343
StakeholderId)
44-
import Pos.Core.Update (BlockVersion, SoftwareVersion)
4544
import Pos.Crypto (AHash, PublicKey)
4645

4746
data AddrDistrPart = AddrDistrPart

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import Test.Hspec (Expectation, Spec, describe, it, shouldBe)
88
import Test.Hspec.QuickCheck (prop)
99
import Test.QuickCheck (Property, property)
1010

11-
import Pos.Core (decodeTextAddress)
12-
import Pos.Core.Update (ApplicationName (..), BlockVersion (..),
11+
import Pos.Chain.Update (ApplicationName (..), BlockVersion (..),
1312
SoftwareVersion (..))
13+
import Pos.Core (decodeTextAddress)
1414
import Pos.Crypto (decodeAbstractHash, parseFullPublicKey,
1515
unsafeCheatingHashCoerce)
1616

‎chain/bench/block-bench.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import Pos.Chain.Block (Body, BodyProof, ConsensusData, ExtraBodyData,
1818
import Pos.Chain.Delegation (DlgPayload)
1919
import Pos.Chain.Ssc (SscPayload)
2020
import Pos.Chain.Txp (TxPayload (..))
21-
import Pos.Core.Update (UpdatePayload)
21+
import Pos.Chain.Update (UpdatePayload)
2222
import Pos.Crypto (ProtocolMagic (..))
2323

2424
import Test.Pos.Chain.Block.Arbitrary.Generate (generateMainBlock)

‎chain/cardano-sl-chain.cabal‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,25 @@ library
138138
Pos.Chain.Ssc.VssCertificate
139139
Pos.Chain.Ssc.VssCertificatesMap
140140

141+
Pos.Chain.Update.ApplicationName
141142
Pos.Chain.Update.BlockVersion
143+
Pos.Chain.Update.BlockVersionData
144+
Pos.Chain.Update.BlockVersionModifier
142145
Pos.Chain.Update.Configuration
143146
Pos.Chain.Update.Constants
147+
Pos.Chain.Update.Data
148+
Pos.Chain.Update.Params
149+
Pos.Chain.Update.Payload
144150
Pos.Chain.Update.Poll
145151
Pos.Chain.Update.Poll.Class
146152
Pos.Chain.Update.Poll.Modifier
147153
Pos.Chain.Update.Poll.Types
148154
Pos.Chain.Update.Poll.Failure
149-
Pos.Chain.Update.Params
155+
Pos.Chain.Update.Proof
156+
Pos.Chain.Update.SoftforkRule
157+
Pos.Chain.Update.SoftwareVersion
158+
Pos.Chain.Update.SystemTag
159+
Pos.Chain.Update.Vote
150160

151161
build-depends: Cabal
152162
, aeson
@@ -264,7 +274,11 @@ test-suite test
264274
Test.Pos.Chain.Txp.Example
265275
Test.Pos.Chain.Txp.Toil.UtxoSpec
266276
Test.Pos.Chain.Update.Arbitrary
267-
Test.Pos.Chain.Update.Arbitrary.Core
277+
Test.Pos.Chain.Update.Bi
278+
Test.Pos.Chain.Update.CborSpec
279+
Test.Pos.Chain.Update.Example
280+
Test.Pos.Chain.Update.Gen
281+
Test.Pos.Chain.Update.Json
268282

269283
build-depends: base
270284
, base16-bytestring
@@ -293,6 +307,7 @@ test-suite test
293307
, random
294308
, serokell-util
295309
, formatting
310+
, time-units
296311
, universum
297312
, unordered-containers
298313
, vector
@@ -316,7 +331,6 @@ benchmark block-bench
316331
Test.Pos.Chain.Ssc.Arbitrary
317332
Test.Pos.Chain.Txp.Arbitrary
318333
Test.Pos.Chain.Update.Arbitrary
319-
Test.Pos.Chain.Update.Arbitrary.Core
320334

321335
ghc-options: -Wall -O2
322336
build-depends: QuickCheck

0 commit comments

Comments
 (0)