[chore] Remove dead code, update weeder.toml to ignore more deps.

libs/wire-api-federation/test/Test/Wire/API/Federation/Golden/Runner.hs

@@ -17,8 +17,6 @@
 
 module Test.Wire.API.Federation.Golden.Runner
   ( testObjects,
-    testFromJSONFailure,
-    testFromJSONObjects,
   )
 where
 
@@ -60,25 +58,6 @@ testObject obj path = do
 
   pure exists
 
-testFromJSONObjects :: forall a. (Typeable a, FromJSON a, Eq a, Show a) => [(a, FilePath)] -> IO ()
-testFromJSONObjects = traverse_ (uncurry testFromJSONObject)
-
-testFromJSONObject :: forall a. (Typeable a, FromJSON a, Eq a, Show a) => a -> FilePath -> IO ()
-testFromJSONObject expected path = do
-  let dir = "test/golden/fromJSON"
-      fullPath = dir <> "/" <> path
-  parsed <- eitherDecodeFileStrict fullPath
-  assertEqual (show (typeRep @a) <> ": FromJSON of " <> path <> " should match object") (Right expected) parsed
-
-testFromJSONFailure :: forall a. (Typeable a, FromJSON a, Show a) => FilePath -> IO ()
-testFromJSONFailure path = do
-  let dir = "test/golden/fromJSON"
-      fullPath = dir <> "/" <> path
-  parsed <- eitherDecodeFileStrict @a fullPath
-  case parsed of
-    Right x -> assertFailure $ show (typeRep @a) <> ": FromJSON of " <> path <> ": expected failure, got " <> show x
-    Left _ -> pure ()
-
 assertRight :: (Show a) => Either a b -> IO b
 assertRight =
   \case

libs/wire-api/src/Wire/API/Routes/Internal/LegalHold.hs

@@ -39,6 +39,7 @@ type InternalLegalHoldAPI =
              :> Put '[] NoContent
        )
 
+-- TODO: should be called, is currently dead code.
 swaggerDoc :: OpenApi
 swaggerDoc =
   toOpenApi (Proxy @InternalLegalHoldAPI)

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

@@ -188,18 +188,10 @@ emailRemoved :: UserId -> Email -> UserEvent
 emailRemoved u e =
   UserIdentityRemoved $ UserIdentityRemovedData u (Just e) Nothing
 
-phoneRemoved :: UserId -> Phone -> UserEvent
-phoneRemoved u p =
-  UserIdentityRemoved $ UserIdentityRemovedData u Nothing (Just p)
-
 emailUpdated :: UserId -> Email -> UserEvent
 emailUpdated u e =
   UserIdentityUpdated $ UserIdentityUpdatedData u (Just e) Nothing
 
-phoneUpdated :: UserId -> Phone -> UserEvent
-phoneUpdated u p =
-  UserIdentityUpdated $ UserIdentityUpdatedData u Nothing (Just p)
-
 emptyUserUpdatedData :: UserId -> UserUpdatedData
 emptyUserUpdatedData u =
   UserUpdatedData

libs/wire-api/test/golden/Test/Wire/API/Golden/Generated.hs

@@ -86,7 +86,6 @@ import Test.Wire.API.Golden.Generated.Event_conversation qualified
 import Test.Wire.API.Golden.Generated.Event_featureConfig qualified
 import Test.Wire.API.Golden.Generated.Event_team qualified
 import Test.Wire.API.Golden.Generated.Event_user qualified
-import Test.Wire.API.Golden.Generated.FeatureStatus_team qualified
 import Test.Wire.API.Golden.Generated.HandleUpdate_user qualified
 import Test.Wire.API.Golden.Generated.InvitationCode_user qualified
 import Test.Wire.API.Golden.Generated.InvitationList_team qualified
@@ -1429,30 +1428,6 @@ tests =
             (Test.Wire.API.Golden.Generated.Event_featureConfig.testObject_Event_featureConfig_9, "testObject_Event_featureConfig_9.json"),
             (Test.Wire.API.Golden.Generated.Event_featureConfig.testObject_Event_featureConfig_10, "testObject_Event_featureConfig_10.json")
           ],
-      testGroup
-        "Golden: FeatureStatus_team"
-        $ testObjects
-          [ (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_1, "testObject_FeatureStatus_team_1.json"),
-            (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_2, "testObject_FeatureStatus_team_2.json"),
-            (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_3, "testObject_FeatureStatus_team_3.json"),
-            (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_4, "testObject_FeatureStatus_team_4.json"),
-            (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_5, "testObject_FeatureStatus_team_5.json"),
-            (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_6, "testObject_FeatureStatus_team_6.json"),
-            (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_7, "testObject_FeatureStatus_team_7.json"),
-            (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_8, "testObject_FeatureStatus_team_8.json"),
-            (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_9, "testObject_FeatureStatus_team_9.json"),
-            (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_10, "testObject_FeatureStatus_team_10.json"),
-            (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_11, "testObject_FeatureStatus_team_11.json"),
-            (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_12, "testObject_FeatureStatus_team_12.json"),
-            (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_13, "testObject_FeatureStatus_team_13.json"),
-            (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_14, "testObject_FeatureStatus_team_14.json"),
-            (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_15, "testObject_FeatureStatus_team_15.json"),
-            (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_16, "testObject_FeatureStatus_team_16.json"),
-            (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_17, "testObject_FeatureStatus_team_17.json"),
-            (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_18, "testObject_FeatureStatus_team_18.json"),
-            (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_19, "testObject_FeatureStatus_team_19.json"),
-            (Test.Wire.API.Golden.Generated.FeatureStatus_team.testObject_FeatureStatus_team_20, "testObject_FeatureStatus_team_20.json")
-          ],
       testGroup
         "Golden: Event_Conversation"
         $ testObjects

libs/wire-api/test/golden/Test/Wire/API/Golden/Generated/NewConv_user.hs

@@ -19,7 +19,6 @@
 
 module Test.Wire.API.Golden.Generated.NewConv_user where
 
-import Data.Domain (Domain (Domain))
 import Data.Id
 import Data.Misc (Milliseconds (Ms, ms))
 import Data.Set qualified as Set (fromList)
@@ -29,9 +28,6 @@ import Wire.API.Conversation
 import Wire.API.Conversation.Role
 import Wire.API.User
 
-testDomain :: Domain
-testDomain = Domain "testdomain.example.com"
-
 testObject_NewConv_user_1 :: NewConv
 testObject_NewConv_user_1 =
   NewConv

libs/wire-api/test/golden/Test/Wire/API/Golden/Manual.hs

@@ -68,7 +68,8 @@ tests =
             (testObject_UserClientPrekeyMap_5, "testObject_UserClientPrekeyMap_5.json"),
             (testObject_UserClientPrekeyMap_6, "testObject_UserClientPrekeyMap_6.json"),
             (testObject_UserClientPrekeyMap_7, "testObject_UserClientPrekeyMap_7.json"),
-            (testObject_UserClientPrekeyMap_8, "testObject_UserClientPrekeyMap_8.json")
+            (testObject_UserClientPrekeyMap_8, "testObject_UserClientPrekeyMap_8.json"),
+            (testObject_UserClientPrekeyMap_8, "testObject_UserClientPrekeyMap_9.json")
           ],
       testGroup "QualifiedUserClientPrekeyMap" $
         testObjects

libs/wire-api/test/golden/Test/Wire/API/Golden/Protobuf.hs

@@ -57,6 +57,9 @@ tests =
             ( testObject_QualifiedNewOtrMessage_user_9,
               "testObject_QualifiedNewOtrMessage_user_9.protobuf"
             ),
+            ( testObject_QualifiedNewOtrMessage_user_10,
+              "testObject_QualifiedNewOtrMessage_user_10.protobuf"
+            ),
             ( testObject_QualifiedNewOtrMessage_user_11,
               "testObject_QualifiedNewOtrMessage_user_11.protobuf"
             ),

libs/wire-api/test/golden/testObject_QualifiedNewOtrMessage_user_10.protobuf

@@ -0,0 +1,11 @@
+sender { client: 8 }
+recipients { domain: "79-y-r4-9.d" }
+recipients { domain: "7f3.ra.9.r37.xavdz88-9vw-z" }
+recipients { domain: "7g.hw9aq-1" }
+recipients { domain: "8w5.g5l-7.tys" }
+recipients { domain: "n.659-s.nfd" }
+recipients { domain: "pc5s-p9-48-x.r8cq.ss89h" }
+native_push: false
+blob: "GL\006"
+transient: false
+ignore_all { }

libs/wire-api/test/golden/testObject_UserClientPrekeyMap_9.json

@@ -0,0 +1 @@
+{}

libs/wire-api/wire-api.cabal

@@ -420,7 +420,6 @@ test-suite wire-api-golden-tests
     Test.Wire.API.Golden.Generated.Event_user
     Test.Wire.API.Golden.Generated.EventType_team
     Test.Wire.API.Golden.Generated.EventType_user
-    Test.Wire.API.Golden.Generated.FeatureStatus_team
     Test.Wire.API.Golden.Generated.HandleUpdate_user
     Test.Wire.API.Golden.Generated.Invitation_team
     Test.Wire.API.Golden.Generated.InvitationCode_user

services/brig/src/Brig/App.hs

@@ -83,7 +83,6 @@ module Brig.App
     runHttpClientIO,
     liftSem,
     lowerAppT,
-    temporaryGetEnv,
     initHttpManagerWithTLSConfig,
     adhocUserKeyStoreInterpreter,
     adhocSessionStoreInterpreter,
@@ -464,9 +463,6 @@ newtype AppT r a = AppT
 lowerAppT :: (Member (Final IO) r) => Env -> AppT r a -> Sem r a
 lowerAppT env (AppT r) = runReaderT r env
 
-temporaryGetEnv :: AppT r Env
-temporaryGetEnv = AppT ask
-
 instance Functor (AppT r) where
   fmap fab (AppT x0) = AppT $ fmap fab x0
 

services/brig/src/Brig/Data/User.hs

@@ -28,7 +28,6 @@ module Brig.Data.User
     insertAccount,
     authenticate,
     reauthenticate,
-    filterActive,
     isSamlUser,
 
     -- * Lookups
@@ -342,15 +341,6 @@ updateStatus u s =
 userExists :: (MonadClient m) => UserId -> m Bool
 userExists uid = isJust <$> retry x1 (query1 idSelect (params LocalQuorum (Identity uid)))
 
-filterActive :: (MonadClient m) => [UserId] -> m [UserId]
-filterActive us =
-  map (view _1) . filter isActiveUser
-    <$> retry x1 (query accountStateSelectAll (params LocalQuorum (Identity us)))
-  where
-    isActiveUser :: (UserId, Bool, Maybe AccountStatus) -> Bool
-    isActiveUser (_, True, Just Active) = True
-    isActiveUser _ = False
-
 lookupUser :: (MonadClient m, MonadReader Env m) => HavePendingInvitations -> UserId -> m (Maybe User)
 lookupUser hpi u = listToMaybe <$> lookupUsers hpi [u]
 
@@ -528,9 +518,6 @@ nameSelect = "SELECT name FROM user WHERE id = ?"
 authSelect :: PrepQuery R (Identity UserId) (Maybe Password, Maybe AccountStatus)
 authSelect = "SELECT password, status FROM user WHERE id = ?"
 
-accountStateSelectAll :: PrepQuery R (Identity [UserId]) (UserId, Bool, Maybe AccountStatus)
-accountStateSelectAll = "SELECT id, activated, status FROM user WHERE id IN ?"
-
 richInfoSelect :: PrepQuery R (Identity UserId) (Identity RichInfoAssocList)
 richInfoSelect = "SELECT json FROM rich_info WHERE user = ?"
 

services/brig/src/Brig/Options.hs

@@ -743,9 +743,6 @@ instance ToJSON AccountFeatureConfigs where
 getAfcConferenceCallingDefNewMaybe :: Lens.Getter Settings (Maybe (Public.WithStatus Public.ConferenceCallingConfig))
 getAfcConferenceCallingDefNewMaybe = Lens.to (Lens.^? (Lens.to setFeatureFlags . Lens._Just . Lens.to afcConferenceCallingDefNew . unImplicitLockStatus))
 
-getAfcConferenceCallingDefNew :: Lens.Getter Settings (Public.WithStatus Public.ConferenceCallingConfig)
-getAfcConferenceCallingDefNew = Lens.to (Public._unImplicitLockStatus . afcConferenceCallingDefNew . fromMaybe defAccountFeatureConfigs . setFeatureFlags)
-
 getAfcConferenceCallingDefNull :: Lens.Getter Settings (Public.WithStatus Public.ConferenceCallingConfig)
 getAfcConferenceCallingDefNull = Lens.to (Public._unImplicitLockStatus . afcConferenceCallingDefNull . fromMaybe defAccountFeatureConfigs . setFeatureFlags)
 

services/gundeck/src/Gundeck/Monad.hs

@@ -32,7 +32,6 @@ module Gundeck.Monad
     runDirect,
     runGundeck,
     fromJsonBody,
-    ifNothing,
     posixTime,
 
     -- * Select which redis to target
@@ -206,10 +205,6 @@ fromJsonBody :: (FromJSON a) => JsonRequest a -> Gundeck a
 fromJsonBody r = exceptT (throwM . mkError status400 "bad-request") pure (parseBody r)
 {-# INLINE fromJsonBody #-}
 
-ifNothing :: Error -> Maybe a -> Gundeck a
-ifNothing e = maybe (throwM e) pure
-{-# INLINE ifNothing #-}
-
 posixTime :: Gundeck Milliseconds
 posixTime = view time >>= liftIO
 {-# INLINE posixTime #-}

services/spar/test-integration/Util/Types.hs

@@ -43,7 +43,6 @@ where
 
 import Bilge
 import Cassandra as Cas
-import Control.Exception
 import Control.Lens (makeLenses, view)
 import Crypto.Random.Types (MonadRandom (..))
 import Data.Aeson
@@ -111,13 +110,13 @@ instance FromJSON TestErrorLabel where
 
 -- A quick unit test that serves two purposes: (1) shows that it works (and helped with debugging);
 -- (2) demonstrates how to use it.
-_unitTestTestErrorLabel :: IO ()
-_unitTestTestErrorLabel = do
-  let val :: Either String TestErrorLabel
-      val = Aeson.eitherDecode "{\"code\":404,\"message\":\"Not found.\",\"label\":\"not-found\"}"
-  unless (val == Right "not-found") $
-    throwIO . ErrorCall . show $
-      val
+-- _unitTestTestErrorLabel :: IO ()
+-- _unitTestTestErrorLabel = do
+--   let val :: Either String TestErrorLabel
+--       val = Aeson.eitherDecode "{\"code\":404,\"message\":\"Not found.\",\"label\":\"not-found\"}"
+--   unless (val == Right "not-found") $
+--     throwIO . ErrorCall . show $
+--       val
 
 -- | FUTUREWORK(fisx): we're running all tests for all constructors of `WireIdPAPIVersion`,
 -- which sometimes makes little sense.  'skipIdPAPIVersions' can be used to pend individual