final cleanup

Author: paweljakubas

cli/src/Oracle/Validate/Requests/TestRun/Create.hs

@@ -9,7 +9,14 @@ module Oracle.Validate.Requests.TestRun.Create
 
 import Control.Monad (when)
 import Control.Monad.Trans.Class (lift)
-import Core.Types.Basic (Commit(..), Directory (..), Duration (..), Repository(..), Try (..), Username(..))
+import Core.Types.Basic
+    ( Commit (..)
+    , Directory (..)
+    , Duration (..)
+    , Repository (..)
+    , Try (..)
+    , Username (..)
+    )
 import Core.Types.Change (Change (..), Key (..))
 import Core.Types.Fact (Fact (..))
 import Core.Types.Operation (Op (..), Operation (..))
@@ -44,8 +51,8 @@ import Text.JSON.Canonical
 import User.Agent.Types (WhiteListKey (..))
 import User.Types
     ( Phase (PendingT)
-    , RegisterUserKey (..)
     , RegisterRoleKey (..)
+    , RegisterUserKey (..)
     , TestRun (..)
     , TestRunState (..)
     , roleOfATestRun
@@ -119,17 +126,39 @@ data TestRunRejection
 
 instance Monad m => ToJSON m TestRunRejection where
     toJSON (UnacceptableDuration minDuration maxDuration) =
-        stringJSON $ "unacceptable duration. Expecting duration to be between "<> show minDuration <> " and "<>show maxDuration
-    toJSON (UnacceptableCommit (Repository org repo) (Commit commit))=
-        stringJSON $ "unacceptable commit. The specified commit "<> show commit<>" cannot be found in the repository "<>show org<>"/"<>show repo
-    toJSON (UnacceptableTryIndex (Try maxIx))=
-        stringJSON $ "unacceptable try index. Expecting at most "<>show maxIx<>" run attempts for a given commit"
-    toJSON (UnacceptableRole (RegisterRoleKey _ (Repository org repo) (Username user)))=
-        stringJSON $ "unacceptable role. User "<>show user<>" has not been registered within the repository "<>show org<>"/"<>show repo
+        stringJSON
+            $ "unacceptable duration. Expecting duration to be between "
+                <> show minDuration
+                <> " and "
+                <> show maxDuration
+    toJSON (UnacceptableCommit (Repository org repo) (Commit commit)) =
+        stringJSON
+            $ "unacceptable commit. The specified commit "
+                <> show commit
+                <> " cannot be found in the repository "
+                <> show org
+                <> "/"
+                <> show repo
+    toJSON (UnacceptableTryIndex (Try maxIx)) =
+        stringJSON
+            $ "unacceptable try index. Expecting at most "
+                <> show maxIx
+                <> " run attempts for a given commit"
+    toJSON ( UnacceptableRole
+                (RegisterRoleKey _ (Repository org repo) (Username user))
+            ) =
+        stringJSON
+            $ "unacceptable role. User "
+                <> show user
+                <> " has not been registered within the repository "
+                <> show org
+                <> "/"
+                <> show repo
     toJSON NoRegisteredKeyVerifiesTheSignature =
-        stringJSON "no registered key verifies the signature"
+        stringJSON
+            "there is no registered Ed25519 SSH key that can verify the signature"
     toJSON UserHasNoRegisteredSSHKeys =
-        stringJSON "user has no Ed25519 registered SSH keys"
+        stringJSON "user has no Ed25519 SSH key registered"
     toJSON (GithubResponseError err) =
         object ["githubResponseError" .= err]
     toJSON (GithubResponseStatusCodeError err) =
@@ -143,7 +172,7 @@ checkDuration
     :: TestRunValidationConfig -> Duration -> Maybe TestRunRejection
 checkDuration TestRunValidationConfig{maxDuration, minDuration} (Duration n)
     | n < minDuration || n > maxDuration =
-          Just $ UnacceptableDuration minDuration maxDuration
+        Just $ UnacceptableDuration minDuration maxDuration
     | otherwise = Nothing
 
 checkRole

cli/test/Oracle/Validate/Requests/TestRun/CreateSpec.hs

@@ -91,10 +91,10 @@ import Test.QuickCheck.EGen
     )
 import User.Agent.Types (WhiteListKey (..))
 import User.Types
-    ( TestRun (..)
+    ( RegisterRoleKey (..)
+    , TestRun (..)
     , TestRunRejection (..)
     , TestRunState (..)
-    , RegisterRoleKey(..)
     , URL (..)
     , tryIndexL
     )
@@ -252,7 +252,9 @@ spec = do
                             testRunState
                 let expectedMinDuration = minDuration testConfig
                 let expectedMaxDuration = maxDuration testConfig
-                onConditionHaveReason mresult (UnacceptableDuration expectedMinDuration expectedMaxDuration)
+                onConditionHaveReason
+                    mresult
+                    (UnacceptableDuration expectedMinDuration expectedMaxDuration)
                     $ duration < expectedMinDuration
                         || duration > expectedMaxDuration
 
@@ -284,7 +286,11 @@ spec = do
                             validation
                             testRunRequest
                             testRunState
-                let role = RegisterRoleKey testRunRequest.platform testRunRequest.repository testRunRequest.requester
+                let role =
+                        RegisterRoleKey
+                            testRunRequest.platform
+                            testRunRequest.repository
+                            testRunRequest.requester
                 onConditionHaveReason mresult (UnacceptableRole role)
                     $ testRunRequest.platform /= testRunFact.platform
                         || testRunRequest.repository.organization