Skip to content

[Peras 43] Move Test.Consensus.Committee.Utils to Test.Util.Committee #2158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
agustinmista wants to merge 1 commit into from
Open

[Peras 43] Move Test.Consensus.Committee.Utils to Test.Util.Committee #2158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ouroboros-consensus.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,7 @@ library unstable-consensus-testlib
Test.Util.ChainDB
Test.Util.ChainUpdates
Test.Util.ChunkInfo
Test.Util.Committee
Test.Util.Corruption
Test.Util.FileLock
Test.Util.HardFork.Future
Expand Down Expand Up @@ -659,7 +660,6 @@ test-suite consensus-test
Test.Consensus.Committee.EveryoneVotes
Test.Consensus.Committee.EveryoneVotes.Tests
Test.Consensus.Committee.TestCrypto
Test.Consensus.Committee.Utils
Test.Consensus.Committee.WFALS
Test.Consensus.Committee.WFALS.Conformance
Test.Consensus.Committee.WFALS.Model
Expand Down
2 changes: 1 addition & 1 deletion ...us-test/Test/Consensus/Committee/Utils.hs → ...-consensus-testlib/Test/Util/Committee.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{-# LANGUAGE FlexibleContexts #-}

-- | Utility functions for the voting committee tests.
module Test.Consensus.Committee.Utils
module Test.Util.Committee
( -- * General utilities
mkPoolId
, unfairWFATiebreaker
Expand Down
2 changes: 1 addition & 1 deletion ouroboros-consensus/test/consensus-test/Test/Consensus/Committee/Class.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import Ouroboros.Consensus.Committee.Crypto
)
import Test.Consensus.Committee.TestCrypto (TestCrypto)
import qualified Test.Consensus.Committee.TestCrypto as TestCrypto
import Test.Consensus.Committee.Utils (mkBucket)
import Test.QuickCheck
( Arbitrary (..)
, Gen
Expand All @@ -41,6 +40,7 @@ import Test.QuickCheck
)
import Test.Tasty (TestTree, testGroup)
import Test.Tasty.QuickCheck (Testable (..), testProperty)
import Test.Util.Committee (mkBucket)
import Test.Util.TestEnv (adjustQuickCheckTests)

tests :: TestTree
Expand Down
20 changes: 10 additions & 10 deletions ouroboros-consensus/test/consensus-test/Test/Consensus/Committee/EveryoneVotes/Tests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,6 @@ import Ouroboros.Consensus.Committee.WFA
)
import Test.Consensus.Committee.TestCrypto (TestCrypto)
import qualified Test.Consensus.Committee.TestCrypto as TestCrypto
import Test.Consensus.Committee.Utils
( eqWithShowCmp
, genPools
, genPositiveStake
, mkBucket
, onError
, tabulateNumPools
, tabulatePoolStake
, unfairWFATiebreaker
)
import Test.QuickCheck
( Gen
, Property
Expand All @@ -65,6 +55,16 @@ import Test.QuickCheck
)
import Test.Tasty (TestTree, testGroup)
import Test.Tasty.QuickCheck (testProperty)
import Test.Util.Committee
( eqWithShowCmp
, genPools
, genPositiveStake
, mkBucket
, onError
, tabulateNumPools
, tabulatePoolStake
, unfairWFATiebreaker
)
import Test.Util.TestEnv (adjustQuickCheckTests)

tests :: TestTree
Expand Down
2 changes: 1 addition & 1 deletion ouroboros-consensus/test/consensus-test/Test/Consensus/Committee/TestCrypto.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ import Ouroboros.Consensus.Committee.Crypto
)
import Ouroboros.Consensus.Committee.Crypto.BLS (KeyRole (..))
import qualified Ouroboros.Consensus.Committee.Crypto.BLS as BLS
import Test.Consensus.Committee.Utils (genEpochNonce)
import Test.QuickCheck
( Arbitrary (..)
, Gen
Expand All @@ -80,6 +79,7 @@ import Test.QuickCheck
)
import Test.Tasty (TestTree, testGroup)
import Test.Tasty.QuickCheck (testProperty)
import Test.Util.Committee (genEpochNonce)
import Test.Util.TestEnv (adjustQuickCheckTests)

-- * Test crypto based on BLS signatures
Expand Down
2 changes: 1 addition & 1 deletion ouroboros-consensus/test/consensus-test/Test/Consensus/Committee/WFALS.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import Data.String (IsString (..))
import qualified Ouroboros.Consensus.Committee.Types as WFA
import Ouroboros.Consensus.Committee.WFA (WFATiebreaker (..))
import qualified Ouroboros.Consensus.Committee.WFA as WFA
import Test.Consensus.Committee.Utils (mkPoolId)
import Test.Consensus.Committee.WFALS.Conformance (conformsToRustImplementation)
import Test.Consensus.Committee.WFALS.Model
( NumSeats
Expand All @@ -38,6 +37,7 @@ import Test.QuickCheck
)
import Test.Tasty (TestTree, testGroup)
import Test.Tasty.QuickCheck (testProperty)
import Test.Util.Committee (mkPoolId)
import Test.Util.TestEnv (adjustQuickCheckTests)

tests :: TestTree
Expand Down
2 changes: 1 addition & 1 deletion ouroboros-consensus/test/consensus-test/Test/Consensus/Committee/WFALS/Model/Utils.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import qualified Data.Map.Strict as Map
import Data.Ratio ((%))
import qualified Data.Set as Set
import Data.Word (Word64)
import Test.Consensus.Committee.Utils (mkBucket)
import Test.Consensus.Committee.WFALS.Model
( IsStake (..)
, NumSeats
Expand All @@ -38,6 +37,7 @@ import Test.QuickCheck
, tabulate
, vectorOf
)
import Test.Util.Committee (mkBucket)

-- * Generators

Expand Down
20 changes: 10 additions & 10 deletions ouroboros-consensus/test/consensus-test/Test/Consensus/Committee/WFALS/Tests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,6 @@ import Ouroboros.Consensus.Committee.WFALS
)
import Test.Consensus.Committee.TestCrypto (TestCrypto)
import qualified Test.Consensus.Committee.TestCrypto as TestCrypto
import Test.Consensus.Committee.Utils
( eqWithShowCmp
, genEpochNonce
, genPools
, mkBucket
, onError
, tabulateNumPools
, tabulatePoolStake
, unfairWFATiebreaker
)
import Test.QuickCheck
( Gen
, Property
Expand All @@ -76,6 +66,16 @@ import Test.QuickCheck
)
import Test.Tasty (TestTree, testGroup)
import Test.Tasty.QuickCheck (testProperty)
import Test.Util.Committee
( eqWithShowCmp
, genEpochNonce
, genPools
, mkBucket
, onError
, tabulateNumPools
, tabulatePoolStake
, unfairWFATiebreaker
)
import Test.Util.TestEnv (adjustQuickCheckTests)

tests :: TestTree
Expand Down