[#1235] merge with #1234 branch

IntersectMBO · Jun 17, 2024 · 10784a6 · 10784a6
1 parent 1975b62
commit 10784a6
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 18 deletions.
diff --git a/govtool/backend/app/Main.hs b/govtool/backend/app/Main.hs
@@ -139,28 +139,21 @@ startApp vvaConfig = do
   connectionPool <- createPool (connectPostgreSQL (encodeUtf8 (dbSyncConnectionString $ getter vvaConfig))) close 1 1 60
   vvaTlsManager <- newManager tlsManagerSettings
   qsem <- newQSem (metadataValidationMaxConcurrentRequests vvaConfig)
-<<<<<<< HEAD
   websocketConnectionsTVar <- newTVarIO mempty
   let appEnv = AppEnv {vvaConfig=vvaConfig, vvaCache=cacheEnv, vvaConnectionPool=connectionPool, vvaTlsManager, vvaMetadataQSem=qsem, vvaWebSocketConnections=websocketConnectionsTVar}
-=======
-  let appEnv = AppEnv {vvaConfig=vvaConfig, vvaCache=cacheEnv, vvaConnectionPool=connectionPool, vvaTlsManager, vvaMetadataQSem=qsem}
->>>>>>> b45e63d1... [#1234] Add reddis support for storing metadata validation results
 
   _ <- forkIO $ do
      result <- runReaderT (runExceptT startFetchProcess) appEnv
      case result of
         Left e -> throw e
         Right _ -> return ()
 
-<<<<<<< HEAD
   _ <- forkIO $ do
       result <- runReaderT (runExceptT $ processTransactionStatuses websocketConnectionsTVar) appEnv
       case result of
         Left e -> throw e
         Right _ -> return ()
 
-=======
->>>>>>> b45e63d1... [#1234] Add reddis support for storing metadata validation results
   server' <- mkVVAServer appEnv
   runSettings settings server'
 

diff --git a/govtool/backend/src/VVA/Transaction.hs b/govtool/backend/src/VVA/Transaction.hs
@@ -10,7 +10,6 @@ import           Data.Map (Map)
 import qualified Network.WebSockets.Connection as WS
 import           GHC.Conc (TVar, threadDelay, readTVar, readTVarIO, writeTVar, atomically)
 import           Data.Maybe
-import           Data.Either.Extra (mapRight)
 import Data.UUID.V4 (nextRandom)
 import           Network.WebSockets.Connection (Connection)
 import qualified Database.Redis as Redis

diff --git a/govtool/backend/src/VVA/Types.hs b/govtool/backend/src/VVA/Types.hs
@@ -9,21 +9,11 @@
 
 module VVA.Types where
 
-<<<<<<< HEAD
-<<<<<<< Updated upstream
-=======
-
 import           GHC.Conc (TVar)
 import qualified Network.WebSockets.Connection as WS
 import           Data.Aeson.TH              (deriveJSON)
 import VVA.API.Utils (jsonOptions)
 import GHC.Generics (Generic)
->>>>>>> Stashed changes
-=======
-import           Data.Aeson.TH              (deriveJSON)
-import VVA.API.Utils (jsonOptions)
-import GHC.Generics (Generic)
->>>>>>> b45e63d1... [#1234] Add reddis support for storing metadata validation results
 import           Control.Exception
 import           Control.Monad.Except       (MonadError)
 import           Control.Monad.Fail         (MonadFail)