fixed unit-tests

input-output-hk · Apr 12, 2024 · 497bf06 · 497bf06
1 parent 0dda88a
commit 497bf06
Show file tree

Hide file tree

Showing 7 changed files with 38,278 additions and 37,267 deletions.
diff --git a/marlowe-chain-sync/.golden/ChainSeekQuery/golden b/marlowe-chain-sync/.golden/ChainSeekQuery/golden
diff --git a/marlowe-runtime-web/.golden/OpenApi/golden b/marlowe-runtime-web/.golden/OpenApi/golden
@@ -182,6 +182,12 @@
                     "contractId": {
                         "$ref": "#/components/schemas/TxOutRef"
                     },
+                    "safetyErrors": {
+                        "items": {
+                            "$ref": "#/components/schemas/SafetyError"
+                        },
+                        "type": "array"
+                    },
                     "transactionId": {
                         "$ref": "#/components/schemas/TxId"
                     },
@@ -2153,9 +2159,6 @@
                         "type": "object"
                     },
                     "minUTxODeposit": {
-                        "format": "int64",
-                        "maximum": 1.8446744073709551615e19,
-                        "minimum": 0,
                         "type": "integer"
                     },
                     "roles": {
@@ -2245,9 +2248,6 @@
                             },
                             "recipients": {
                                 "additionalProperties": {
-                                    "format": "int64",
-                                    "maximum": 1.8446744073709551615e19,
-                                    "minimum": 0,
                                     "type": "integer"
                                 },
                                 "type": "object"

diff --git a/marlowe-runtime-web/src/Language/Marlowe/Runtime/Web/Core/Roles.hs b/marlowe-runtime-web/src/Language/Marlowe/Runtime/Web/Core/Roles.hs
@@ -58,7 +58,7 @@ import qualified Data.OpenApi as OpenApi
 import Data.OpenApi.Schema (ToSchema (..))
 import Data.Text (Text)
 import Data.Traversable (for)
-import Data.Word (Word64)
+
 import GHC.Generics (Generic)
 import Language.Marlowe.Runtime.Web.Adapter.URI (
   uriFromJSON,
@@ -197,7 +197,7 @@ instance ToSchema RoleTokenConfig where
   declareNamedSchema _ = do
     simpleSchema <- declareSchemaRef (Proxy @Address)
     metadataSchema <- declareSchemaRef (Proxy @TokenMetadata)
-    quantitySchema <- declareSchemaRef (Proxy @Word64)
+    quantitySchema <- declareSchemaRef (Proxy @Integer)
     let multiSchema =
           mempty
             & type_ ?~ OpenApiObject

diff --git a/marlowe-runtime-web/test/Spec.hs b/marlowe-runtime-web/test/Spec.hs
@@ -71,12 +71,23 @@ import Language.Marlowe.Runtime.Web.OpenAPIServer (
  )
 import qualified Language.Marlowe.Runtime.Web.Payout.API as Web
 
+import GHC.Generics (Generic)
+import Language.Marlowe.Analysis.Safety.Types (
+  SafetyError (MissingRolesCurrency),
+ )
+import qualified Language.Marlowe.Analysis.Safety.Types as Web
 import qualified Language.Marlowe.Runtime.Web.Role.API as Web
 import qualified Language.Marlowe.Runtime.Web.Role.TokenFilter as Web
 import qualified Language.Marlowe.Runtime.Web.Tx.API as Web
 import qualified Language.Marlowe.Runtime.Web.Withdrawal.API as Web
-import Servant.API
-import Servant.OpenApi
+import Servant.API (
+  Headers,
+  ReqBody',
+  Verb,
+  type (:<|>),
+  type (:>),
+ )
+import Servant.OpenApi (validateEveryToJSONWithPatternChecker)
 import Spec.Marlowe.Semantics.Arbitrary (
   ValidContractStructure (unValidContractStructure),
  )
@@ -609,7 +620,19 @@ instance Arbitrary (Web.WithdrawTxEnvelope tx) where
   shrink = genericShrink
 
 instance Arbitrary (Web.ApplyInputsTxEnvelope tx) where
-  arbitrary = Web.ApplyInputsTxEnvelope <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary
+  arbitrary =
+    Web.ApplyInputsTxEnvelope
+      <$> arbitrary
+      <*> arbitrary
+      <*> arbitrary
+      <*> (fmap . fmap) unWebSafetyError arbitrary
+  shrink = genericShrink
+
+newtype WebSafetyError = WebSafetyError {unWebSafetyError :: Web.SafetyError}
+  deriving (Show, Generic)
+
+instance Arbitrary WebSafetyError where
+  arbitrary = pure . WebSafetyError $ MissingRolesCurrency
   shrink = genericShrink
 
 instance Arbitrary (Web.BurnRoleTokensTxEnvelope tx) where