Use Cardano.Wallet.Api.Types.strictRecordTypeOptions

cardano-foundation · Jul 20, 2021 · 4aeb220 · 4aeb220
1 parent de46648
commit 4aeb220
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/lib/core/src/Cardano/Wallet/Api/Types.hs b/lib/core/src/Cardano/Wallet/Api/Types.hs
@@ -2587,9 +2587,9 @@ instance ToJSON ApiSignedTransaction where
     toJSON = genericToJSON defaultRecordTypeOptions
 
 instance FromJSON ApiSignTransactionPostData where
-    parseJSON = genericParseJSON defaultRecordTypeOptions
+    parseJSON = genericParseJSON strictRecordTypeOptions
 instance ToJSON ApiSignTransactionPostData where
-    toJSON = genericToJSON defaultRecordTypeOptions
+    toJSON = genericToJSON strictRecordTypeOptions
 
 instance DecodeAddress t => FromJSON (PostTransactionOldData t) where
     parseJSON = genericParseJSON defaultRecordTypeOptions

diff --git a/lib/core/test/unit/Cardano/Wallet/Api/Malformed.hs b/lib/core/test/unit/Cardano/Wallet/Api/Malformed.hs
@@ -1213,9 +1213,9 @@ instance Malformed (BodyParam ApiSignTransactionPostData) where
             [ ("1020344", "Error in $: parsing Cardano.Wallet.Api.Types.ApiSignTransactionPostData(ApiSignTransactionPostData) failed, expected Object, but encountered Number")
             , ("\"hello\"", "Error in $: parsing Cardano.Wallet.Api.Types.ApiSignTransactionPostData(ApiSignTransactionPostData) failed, expected Object, but encountered String")
             , ("{\"transaction\": \"\", \"random\"}", msgJsonInvalid)
-            , ("{\"transaction\": \"lah\", \"passphase\": \"Secure Passphrase\"}", "Error in $.transaction: Parse error. Expecting Base64-encoded format.")
-            , ("{\"transaction\": 1020344, \"passphase\": \"Secure Passphrase\"}", "Error in $.transaction: parsing 'Base64 ByteString failed, expected String, but encountered Number")
-            , ("{\"transaction\": { \"body\": 1020344 }, \"passphase\": \"Secure Passphrase\"}", "Error in $.transaction: parsing 'Base64 ByteString failed, expected String, but encountered Object")
+            , ("{\"transaction\": \"lah\", \"passphrase\": \"Secure Passphrase\"}", "Error in $.transaction: Parse error. Expecting Base64-encoded format.")
+            , ("{\"transaction\": 1020344, \"passphrase\": \"Secure Passphrase\"}", "Error in $.transaction: parsing 'Base64 ByteString failed, expected String, but encountered Number")
+            , ("{\"transaction\": { \"body\": 1020344 }, \"passphrase\": \"Secure Passphrase\"}", "Error in $.transaction: parsing 'Base64 ByteString failed, expected String, but encountered Object")
             ]
          jsonValid = first (BodyParam . Aeson.encode) <$>
             [ -- passphrase
@@ -1236,6 +1236,13 @@ instance Malformed (BodyParam ApiSignTransactionPostData) where
                }|]
                , "Error in $.transaction: parsing 'Base64 ByteString failed, expected String, but encountered Object"
               )
+            , ( [aesonQQ|
+               { "transaction": "cafecafe",
+                  "passphrase": "Secure Passphrase",
+                  "extra": "hello"
+               }|]
+               , "Error in $: parsing Cardano.Wallet.Api.Types.ApiSignTransactionPostData(ApiSignTransactionPostData) failed, unknown fields: ['extra']"
+              )
             ]
 
 instance Malformed (BodyParam (PostTransactionOldData ('Testnet pm))) where