Fix tests

cardano-foundation · Oct 1, 2020 · aef0bdc · aef0bdc
1 parent c764172
commit aef0bdc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Transactions.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Transactions.hs
@@ -36,7 +36,6 @@ import Cardano.Wallet.Api.Types
     , WalletStyle (..)
     , insertedAt
     , pendingSince
-    , time
     )
 import Cardano.Wallet.Primitive.AddressDerivation
     ( PaymentAddress )
@@ -45,7 +44,7 @@ import Cardano.Wallet.Primitive.AddressDerivation.Icarus
 import Cardano.Wallet.Primitive.Types
     ( Direction (..)
     , Hash (..)
-    , SlotNo (..)
+    , SlotNo (SlotNo)
     , SortOrder (..)
     , TxMetadata (..)
     , TxMetadataValue (..)

diff --git a/lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs b/lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs
@@ -64,6 +64,7 @@ import Cardano.Wallet.Api.Types
     , ApiPutAddressesData (..)
     , ApiRelativeAddressIndex (..)
     , ApiSelectCoinsData (..)
+    , ApiSlotReference (..)
     , ApiStakePool (..)
     , ApiStakePoolMetrics (..)
     , ApiT (..)
@@ -316,6 +317,7 @@ spec = do
             jsonRoundtripAndGolden $ Proxy @ApiTimeReference
             jsonRoundtripAndGolden $ Proxy @ApiNetworkTip
             jsonRoundtripAndGolden $ Proxy @ApiBlockReference
+            jsonRoundtripAndGolden $ Proxy @ApiSlotReference
             jsonRoundtripAndGolden $ Proxy @ApiNetworkInformation
             jsonRoundtripAndGolden $ Proxy @ApiNetworkParameters
             jsonRoundtripAndGolden $ Proxy @ApiNetworkClock
@@ -1242,8 +1244,8 @@ instance Arbitrary ApiBlockReference where
     shrink = genericShrink
 
 instance Arbitrary ApiSlotReference where
-    arbitrary = genericArbitrary
-    shrink = genericShrink
+    arbitrary = ApiSlotReference <$> genUniformTime <*> arbitrary
+    shrink (ApiSlotReference t sl) = ApiSlotReference t <$> shrink sl
 
 instance Arbitrary ApiNetworkTip where
     arbitrary = genericArbitrary
@@ -1367,14 +1369,17 @@ instance Arbitrary (ApiTransaction t) where
     arbitrary = do
         txStatus <- arbitrary
         txInsertedAt <- case txStatus of
-            (ApiT Pending) -> pure Nothing
-            (ApiT InLedger) -> arbitrary
-            (ApiT Expired) -> pure Nothing
+            ApiT Pending -> pure Nothing
+            ApiT InLedger -> arbitrary
+            ApiT Expired -> pure Nothing
         txPendingSince <- case txStatus of
-            (ApiT Pending) -> arbitrary
-            (ApiT InLedger) -> pure Nothing
-            (ApiT Expired) -> arbitrary
-        let txExpiresAt = txInsertedAt
+            ApiT Pending -> arbitrary
+            ApiT InLedger -> pure Nothing
+            ApiT Expired -> arbitrary
+        txExpiresAt <- case txStatus of
+            ApiT Pending -> arbitrary
+            ApiT InLedger -> pure Nothing
+            ApiT Expired -> Just <$> arbitrary
 
         ApiTransaction
             <$> arbitrary