Move common Arbitrary instances to types-common package.

changelog.d/5-internal/move-common-arbitrary-instances

@@ -0,0 +1 @@
+Move common Arbitrary instances to types-common package for compilation speed

libs/brig-types/src/Brig/Types/Connection.hs

@@ -32,7 +32,7 @@ import Data.Aeson
 import Data.Id (UserId)
 import Data.Qualified
 import Imports
-import Wire.API.Arbitrary
+import Wire.Arbitrary
 
 -- | Response type for endpoints returning lists of users with a specific connection state.
 -- E.g. 'getContactList' returns a 'UserIds' containing the list of connections in an

libs/brig-types/src/Brig/Types/Test/Arbitrary.hs

@@ -18,7 +18,7 @@
 -- with this program. If not, see <https://www.gnu.org/licenses/>.
 
 module Brig.Types.Test.Arbitrary
-  ( module Wire.API.Arbitrary,
+  ( module Wire.Arbitrary,
   )
 where
 
@@ -27,7 +27,7 @@ import Brig.Types.Team.LegalHold
 import Data.String.Conversions (cs)
 import Imports
 import Test.QuickCheck
-import Wire.API.Arbitrary
+import Wire.Arbitrary
 
 instance Arbitrary ExcludedPrefix where
   arbitrary = ExcludedPrefix <$> arbitrary <*> arbitrary

libs/galley-types/src/Galley/Types/Teams/Intra.hs

@@ -34,10 +34,10 @@ import Data.Json.Util
 import Data.Time (UTCTime)
 import Imports
 import Test.QuickCheck.Arbitrary (Arbitrary)
-import Wire.API.Arbitrary (GenericUniform (..))
 import Wire.API.Message (UserClients)
 import Wire.API.Team (Team)
 import Wire.API.Team.LegalHold (LegalholdProtectee)
+import Wire.Arbitrary (GenericUniform (..))
 
 data TeamStatus
   = Active

libs/wire-api/src/Wire/API/Arbitrary.hs → libs/types-common/src/Wire/Arbitrary.hs

@@ -20,7 +20,7 @@
 -- You should have received a copy of the GNU Affero General Public License along
 -- with this program. If not, see <https://www.gnu.org/licenses/>.
 
-module Wire.API.Arbitrary
+module Wire.Arbitrary
   ( Arbitrary (..),
     GenericUniform (..),
     listOf',

libs/types-common/types-common.cabal

@@ -35,6 +35,7 @@ library
     Util.Options
     Util.Options.Common
     Util.Test
+    Wire.Arbitrary
     Wire.Swagger
 
   other-modules:      Paths_types_common
@@ -88,7 +89,7 @@ library
       aeson                  >=2.0.1.0
     , attoparsec             >=0.11
     , attoparsec-iso8601
-    , base                   >=4        && <5
+    , base                   >=4            && <5
     , base16-bytestring      >=0.1
     , base64-bytestring      >=1.0
     , binary
@@ -99,13 +100,18 @@ library
     , cryptohash-md5         >=0.11.7.2
     , cryptohash-sha1        >=0.11.7.2
     , cryptonite             >=0.26
+    , currency-codes         >=3.0.0.1
     , data-default           >=0.5
+    , generic-random         >=1.4.0.0
     , hashable               >=1.2
     , http-api-data
     , imports
     , iproute                >=1.5
+    , iso3166-country-codes  >=0.20140203.8
+    , iso639                 >=0.1.0.3
     , lens                   >=4.10
     , lens-datetime          >=0.3
+    , mime                   >=0.4.0.2
     , optparse-applicative   >=0.10
     , protobuf               >=0.2
     , QuickCheck             >=2.9

libs/wire-api-federation/src/Wire/API/Federation/API/Brig.hs

@@ -24,7 +24,6 @@ import Data.Range
 import Imports
 import Servant.API
 import Test.QuickCheck (Arbitrary)
-import Wire.API.Arbitrary (GenericUniform (..))
 import Wire.API.Federation.API.Common
 import Wire.API.Federation.Endpoint
 import Wire.API.Federation.Version
@@ -36,6 +35,7 @@ import Wire.API.User.Client.Prekey (ClientPrekey, PrekeyBundle)
 import Wire.API.User.Search
 import Wire.API.UserMap (UserMap)
 import Wire.API.Util.Aeson (CustomEncoded (..))
+import Wire.Arbitrary (GenericUniform (..))
 
 newtype SearchRequest = SearchRequest {term :: Text}
   deriving (Show, Eq, Generic, Typeable)

libs/wire-api-federation/src/Wire/API/Federation/API/Cargohold.hs

@@ -21,11 +21,11 @@ import Data.Aeson (FromJSON (..), ToJSON (..))
 import Data.Id
 import Imports
 import Servant.API
-import Wire.API.Arbitrary (Arbitrary, GenericUniform (..))
 import Wire.API.Asset
 import Wire.API.Federation.Endpoint
 import Wire.API.Routes.AssetBody
 import Wire.API.Util.Aeson
+import Wire.Arbitrary (Arbitrary, GenericUniform (..))
 
 data GetAsset = GetAsset
   { -- | User requesting the asset. Implictly qualified with the source domain.

libs/wire-api-federation/src/Wire/API/Federation/API/Common.hs

@@ -20,7 +20,7 @@ module Wire.API.Federation.API.Common where
 import Data.Aeson
 import Imports
 import Test.QuickCheck
-import Wire.API.Arbitrary
+import Wire.Arbitrary
 
 -- | This is equivalent to '()', but JSONifies to an empty object instead of an
 -- empty array.

libs/wire-api-federation/src/Wire/API/Federation/API/Galley.hs

@@ -27,7 +27,6 @@ import Data.Time.Clock (UTCTime)
 import Imports
 import qualified Network.Wai.Utilities.Error as Wai
 import Servant.API
-import Wire.API.Arbitrary (Arbitrary, GenericUniform (..))
 import Wire.API.Conversation
 import Wire.API.Conversation.Action
 import Wire.API.Conversation.Protocol
@@ -38,6 +37,7 @@ import Wire.API.Federation.Endpoint
 import Wire.API.Message
 import Wire.API.Routes.Public.Galley
 import Wire.API.Util.Aeson (CustomEncoded (..))
+import Wire.Arbitrary (Arbitrary, GenericUniform (..))
 
 -- FUTUREWORK: data types, json instances, more endpoints. See
 -- https://wearezeta.atlassian.net/wiki/spaces/CORE/pages/356090113/Federation+Galley+Conversation+API

libs/wire-api-federation/src/Wire/API/Federation/Component.hs

@@ -19,7 +19,7 @@ module Wire.API.Federation.Component where
 
 import Imports
 import Test.QuickCheck (Arbitrary)
-import Wire.API.Arbitrary (GenericUniform (..))
+import Wire.Arbitrary (GenericUniform (..))
 
 data Component
   = Brig

libs/wire-api/src/Wire/API/Asset.hs

@@ -88,9 +88,9 @@ import qualified Data.UUID as UUID
 import Imports
 import Servant
 import URI.ByteString
-import Wire.API.Arbitrary (Arbitrary (..), GenericUniform (..))
 import Wire.API.Error
 import Wire.API.Routes.MultiVerb
+import Wire.Arbitrary (Arbitrary (..), GenericUniform (..))
 
 --------------------------------------------------------------------------------
 -- Asset

libs/wire-api/src/Wire/API/Call/Config.hs

@@ -91,7 +91,7 @@ import Data.Time.Clock.POSIX
 import Imports
 import qualified Test.QuickCheck as QC
 import Text.Hostname (validHostname)
-import Wire.API.Arbitrary (Arbitrary (arbitrary), GenericUniform (..))
+import Wire.Arbitrary (Arbitrary (arbitrary), GenericUniform (..))
 
 --------------------------------------------------------------------------------
 -- RTCConfiguration

libs/wire-api/src/Wire/API/Connection.hs

@@ -58,8 +58,8 @@ import qualified Data.Swagger.Build.Api as Doc
 import Data.Text as Text
 import Imports
 import Servant.API
-import Wire.API.Arbitrary (Arbitrary (..), GenericUniform (..))
 import Wire.API.Routes.MultiTablePaging
+import Wire.Arbitrary (Arbitrary (..), GenericUniform (..))
 
 --------------------------------------------------------------------------------
 -- UserConnectionList

libs/wire-api/src/Wire/API/Conversation.hs

@@ -112,12 +112,12 @@ import qualified Data.Swagger as S
 import qualified Data.Swagger.Build.Api as Doc
 import Imports
 import System.Random (randomRIO)
-import Wire.API.Arbitrary
 import Wire.API.Conversation.Member
 import Wire.API.Conversation.Protocol
 import Wire.API.Conversation.Role (RoleName, roleNameWireAdmin)
 import Wire.API.MLS.Group
 import Wire.API.Routes.MultiTablePaging
+import Wire.Arbitrary
 
 --------------------------------------------------------------------------------
 -- Conversation

libs/wire-api/src/Wire/API/Conversation/Action.hs

@@ -43,11 +43,11 @@ import Data.Singletons.TH
 import qualified Data.Swagger as S
 import Data.Time.Clock
 import Imports
-import Wire.API.Arbitrary (Arbitrary (..))
 import Wire.API.Conversation
 import Wire.API.Conversation.Action.Tag
 import Wire.API.Conversation.Role
 import Wire.API.Event.Conversation
+import Wire.Arbitrary (Arbitrary (..))
 
 -- | We use this type family instead of a sum type to be able to define
 -- individual effects per conversation action. See 'HasConversationActionEffects'.

libs/wire-api/src/Wire/API/Conversation/Action/Tag.hs

@@ -26,7 +26,7 @@ import Data.Schema hiding (tag)
 import Data.Singletons.TH
 import Imports
 import Test.QuickCheck (elements)
-import Wire.API.Arbitrary (Arbitrary (..))
+import Wire.Arbitrary (Arbitrary (..))
 
 data ConversationActionTag
   = ConversationJoinTag

libs/wire-api/src/Wire/API/Conversation/Bot.hs

@@ -30,10 +30,10 @@ import Data.Aeson
 import Data.Id
 import Data.Json.Util ((#))
 import Imports
-import Wire.API.Arbitrary (Arbitrary, GenericUniform (..))
 import Wire.API.Event.Conversation (Event)
 import Wire.API.User.Client.Prekey (Prekey)
 import Wire.API.User.Profile (Asset, ColourId, Locale, Name)
+import Wire.Arbitrary (Arbitrary, GenericUniform (..))
 
 --------------------------------------------------------------------------------
 -- AddBot

libs/wire-api/src/Wire/API/Conversation/Code.hs

@@ -43,7 +43,7 @@ import qualified Data.Swagger as S
 import qualified Data.Swagger.Build.Api as Doc
 import Imports
 import qualified URI.ByteString as URI
-import Wire.API.Arbitrary (Arbitrary, GenericUniform (..))
+import Wire.Arbitrary (Arbitrary, GenericUniform (..))
 
 data ConversationCode = ConversationCode
   { conversationKey :: Code.Key,

libs/wire-api/src/Wire/API/Conversation/Member.hs

@@ -51,9 +51,9 @@ import qualified Data.Swagger as S
 import qualified Data.Swagger.Build.Api as Doc
 import Imports
 import qualified Test.QuickCheck as QC
-import Wire.API.Arbitrary (Arbitrary (arbitrary), GenericUniform (..))
 import Wire.API.Conversation.Role
 import Wire.API.Provider.Service (ServiceRef, modelServiceRef)
+import Wire.Arbitrary (Arbitrary (arbitrary), GenericUniform (..))
 
 data ConvMembers = ConvMembers
   { cmSelf :: Member,

libs/wire-api/src/Wire/API/Conversation/Protocol.hs

@@ -37,11 +37,11 @@ import Control.Lens (makePrisms, (?~))
 import Data.Aeson (FromJSON (..), ToJSON (..))
 import Data.Schema
 import Imports
-import Wire.API.Arbitrary
 import Wire.API.Conversation.Action.Tag
 import Wire.API.MLS.CipherSuite
 import Wire.API.MLS.Epoch
 import Wire.API.MLS.Group
+import Wire.Arbitrary
 
 data ProtocolTag = ProtocolProteusTag | ProtocolMLSTag
   deriving stock (Eq, Show, Enum, Bounded, Generic)

libs/wire-api/src/Wire/API/Conversation/Role.hs

@@ -83,7 +83,7 @@ import qualified Deriving.Swagger as S
 import GHC.TypeLits
 import Imports
 import qualified Test.QuickCheck as QC
-import Wire.API.Arbitrary (Arbitrary (arbitrary), GenericUniform (..))
+import Wire.Arbitrary (Arbitrary (arbitrary), GenericUniform (..))
 
 --------------------------------------------------------------------------------
 -- Role

libs/wire-api/src/Wire/API/Conversation/Typing.hs

@@ -33,7 +33,7 @@ import Data.Schema
 import qualified Data.Swagger as S
 import qualified Data.Swagger.Build.Api as Doc
 import Imports
-import Wire.API.Arbitrary (Arbitrary, GenericUniform (..))
+import Wire.Arbitrary (Arbitrary, GenericUniform (..))
 
 newtype TypingData = TypingData
   { tdStatus :: TypingStatus

libs/wire-api/src/Wire/API/CustomBackend.hs

@@ -28,7 +28,7 @@ import Data.Schema
 import qualified Data.Swagger as S
 import Deriving.Aeson
 import Imports
-import Wire.API.Arbitrary (Arbitrary, GenericUniform (..))
+import Wire.Arbitrary (Arbitrary, GenericUniform (..))
 
 data CustomBackend = CustomBackend
   { backendConfigJsonUrl :: HttpsUrl,

libs/wire-api/src/Wire/API/Event/Conversation.hs

@@ -79,12 +79,12 @@ import Data.Time
 import Imports
 import qualified Test.QuickCheck as QC
 import URI.ByteString ()
-import Wire.API.Arbitrary (Arbitrary (arbitrary), GenericUniform (..))
 import Wire.API.Conversation
 import Wire.API.Conversation.Code (ConversationCode (..))
 import Wire.API.Conversation.Role
 import Wire.API.Conversation.Typing (TypingData (..))
 import Wire.API.User (QualifiedUserIdList (..))
+import Wire.Arbitrary (Arbitrary (arbitrary), GenericUniform (..))
 
 --------------------------------------------------------------------------------
 -- Event

libs/wire-api/src/Wire/API/Event/Team.hs

@@ -54,9 +54,9 @@ import qualified Data.Swagger.Build.Api as Doc
 import Data.Time (UTCTime)
 import Imports
 import qualified Test.QuickCheck as QC
-import Wire.API.Arbitrary (Arbitrary (arbitrary), GenericUniform (..))
 import Wire.API.Team (Team, TeamUpdateData, modelUpdateData)
 import Wire.API.Team.Permission (Permissions)
+import Wire.Arbitrary (Arbitrary (arbitrary), GenericUniform (..))
 
 --------------------------------------------------------------------------------
 -- Event

libs/wire-api/src/Wire/API/MLS/CipherSuite.hs

@@ -31,9 +31,9 @@ import qualified Data.Swagger as S
 import qualified Data.Swagger.Internal.Schema as S
 import Data.Word
 import Imports
-import Wire.API.Arbitrary
 import Wire.API.MLS.Credential
 import Wire.API.MLS.Serialisation
+import Wire.Arbitrary
 
 newtype CipherSuite = CipherSuite {cipherSuiteNumber :: Word16}
   deriving stock (Eq, Show)

libs/wire-api/src/Wire/API/MLS/Credential.hs

@@ -38,8 +38,8 @@ import qualified Data.Text as T
 import Data.UUID
 import Imports
 import Web.HttpApiData
-import Wire.API.Arbitrary
 import Wire.API.MLS.Serialisation
+import Wire.Arbitrary
 
 -- | An MLS credential.
 --

libs/wire-api/src/Wire/API/MLS/Epoch.hs

@@ -22,8 +22,8 @@ module Wire.API.MLS.Epoch where
 import Data.Binary
 import Data.Schema
 import Imports
-import Wire.API.Arbitrary
 import Wire.API.MLS.Serialisation
+import Wire.Arbitrary
 
 newtype Epoch = Epoch {epochNumber :: Word64}
   deriving stock (Eq, Show)

libs/wire-api/src/Wire/API/MLS/Extension.hs

@@ -47,9 +47,9 @@ import Data.Binary
 import Data.Singletons.TH
 import Data.Time.Clock.POSIX
 import Imports
-import Wire.API.Arbitrary
 import Wire.API.MLS.CipherSuite
 import Wire.API.MLS.Serialisation
+import Wire.Arbitrary
 
 newtype ProtocolVersion = ProtocolVersion {pvNumber :: Word8}
   deriving newtype (Eq, Ord, Show, Binary, Arbitrary)

libs/wire-api/src/Wire/API/MLS/Group.hs

@@ -27,8 +27,8 @@ import Data.Qualified
 import Data.Schema
 import qualified Data.Swagger as S
 import Imports
-import Wire.API.Arbitrary
 import Wire.API.MLS.Serialisation
+import Wire.Arbitrary
 
 newtype GroupId = GroupId {unGroupId :: ByteString}
   deriving (Eq, Show, Generic)

libs/wire-api/src/Wire/API/MLS/KeyPackage.hs

@@ -52,12 +52,12 @@ import qualified Data.Swagger as S
 import Imports
 import Test.QuickCheck
 import Web.HttpApiData
-import Wire.API.Arbitrary
 import Wire.API.MLS.CipherSuite
 import Wire.API.MLS.Context
 import Wire.API.MLS.Credential
 import Wire.API.MLS.Extension
 import Wire.API.MLS.Serialisation
+import Wire.Arbitrary
 
 data KeyPackageUpload = KeyPackageUpload
   {kpuKeyPackages :: [RawMLS KeyPackage]}

libs/wire-api/src/Wire/API/MLS/Message.hs

@@ -57,7 +57,6 @@ import Data.Singletons.TH
 import qualified Data.Swagger as S
 import Imports
 import Test.QuickCheck hiding (label)
-import Wire.API.Arbitrary (GenericUniform (..))
 import Wire.API.Event.Conversation
 import Wire.API.MLS.CipherSuite
 import Wire.API.MLS.Commit
@@ -66,6 +65,7 @@ import Wire.API.MLS.Group
 import Wire.API.MLS.KeyPackage
 import Wire.API.MLS.Proposal
 import Wire.API.MLS.Serialisation
+import Wire.Arbitrary (GenericUniform (..))
 
 data WireFormatTag = MLSPlainText | MLSCipherText
   deriving (Bounded, Enum, Eq, Show)