Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Commit 13d70a0

Browse files
aviethavieth
committed
make wallet, shutdown test build / pass
1 parent da48c33 commit 13d70a0

File tree

7 files changed

+39
-52
lines changed

7 files changed

+39
-52
lines changed

‎nix/.stack.nix/acid-state.nix

+3-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎nix/.stack.nix/cardano-sl-infra-test.nix

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎nix/.stack.nix/default.nix

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎stack.yaml

+6-5
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ packages:
9494
commit: 984386467466d89621eda1cff8bbb435a9b9c0ef
9595
extra-dep: true
9696

97-
# Waiting on the space leak bug fix PR to be merged:
98-
# https://github.com/acid-state/acid-state/pull/104
97+
# Works with latest network, because it does not depend upon network!
98+
# Blew away the Acid.Remote modules, since we don't use them anyway.
9999
- location:
100-
git: https://github.com/parsonsmatt/acid-state
101-
commit: a1b23e2056f134e53f705a694ab85deeecabec5c
100+
git: https://github.com/avieth/acid-state
101+
commit: 7c00aeeeb731f5c98fe1104693c0136b384cb824
102102
extra-dep: true
103103

104104
# Required for explorer.
@@ -181,7 +181,6 @@ extra-deps:
181181
- servant-swagger-ui-redoc-0.3.0.1.21.2
182182

183183
# Needed to LTS-12.16 compatibility
184-
- wai-middleware-throttle-0.3.0.0
185184
- ether-0.5.1.0
186185
- servant-quickcheck-0.0.7.2
187186
- o-clock-0.1.1
@@ -227,6 +226,8 @@ extra-deps:
227226
- warp-3.2.27
228227
- wai-extra-3.0.26
229228

229+
- wai-middleware-throttle-0.3.0.1 # cardano-wallet needs this
230+
230231

231232
# katip-0.6.3.0 conflicts with Win32-2.6.1.0
232233
allow-newer: true

‎wallet/src/Cardano/Wallet/API/V1/Swagger.hs

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
{-# LANGUAGE UndecidableInstances #-}
99
{-# LANGUAGE ViewPatterns #-}
1010
{-# OPTIONS_GHC -fno-warn-orphans #-}
11+
1112
module Cardano.Wallet.API.V1.Swagger where
1213

1314
import Universum hiding (get, put)
@@ -260,7 +261,7 @@ instance ToSchema Core.Address where
260261

261262
instance ToParamSchema Core.Address where
262263
toParamSchema _ = mempty
263-
& type_ .~ SwaggerString
264+
& type_ ?~ SwaggerString
264265

265266
instance ToParamSchema (V1 Core.Address) where
266267
toParamSchema _ = toParamSchema (Proxy @Core.Address)

‎wallet/src/Cardano/Wallet/API/V1/Types.hs

+24-24
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ instance Arbitrary (V1 Core.PassPhrase) where
239239
instance ToSchema (V1 Core.PassPhrase) where
240240
declareNamedSchema _ =
241241
pure $ NamedSchema (Just "V1PassPhrase") $ mempty
242-
& type_ .~ SwaggerString
242+
& type_ ?~ SwaggerString
243243
& format ?~ "hex|base16"
244244

245245
instance ToJSON (V1 Core.Coin) where
@@ -257,7 +257,7 @@ instance Arbitrary (V1 Core.Coin) where
257257
instance ToSchema (V1 Core.Coin) where
258258
declareNamedSchema _ =
259259
pure $ NamedSchema (Just "V1Coin") $ mempty
260-
& type_ .~ SwaggerNumber
260+
& type_ ?~ SwaggerNumber
261261
& maximum_ .~ Just (fromIntegral Core.maxCoinVal)
262262

263263
instance ToJSON (V1 Core.Address) where
@@ -275,7 +275,7 @@ instance Arbitrary (V1 Core.Address) where
275275
instance ToSchema (V1 Core.Address) where
276276
declareNamedSchema _ =
277277
pure $ NamedSchema (Just "Address") $ mempty
278-
& type_ .~ SwaggerString
278+
& type_ ?~ SwaggerString
279279
& format ?~ "base58"
280280

281281
instance FromHttpApiData (V1 Core.Address) where
@@ -318,7 +318,7 @@ instance Arbitrary (V1 Core.Timestamp) where
318318
instance ToSchema (V1 Core.Timestamp) where
319319
declareNamedSchema _ =
320320
pure $ NamedSchema (Just "Timestamp") $ mempty
321-
& type_ .~ SwaggerString
321+
& type_ ?~ SwaggerString
322322
& description ?~ "Time in ISO 8601 format"
323323

324324
--
@@ -364,7 +364,7 @@ deriveJSON
364364
instance ToSchema AssuranceLevel where
365365
declareNamedSchema _ =
366366
pure $ NamedSchema (Just "AssuranceLevel") $ mempty
367-
& type_ .~ SwaggerString
367+
& type_ ?~ SwaggerString
368368
& enum_ ?~ ["normal", "strict"]
369369

370370
deriveSafeBuildable ''AssuranceLevel
@@ -418,7 +418,7 @@ deriveJSON Aeson.defaultOptions { A.constructorTagModifier = reverse . drop 6 .
418418
instance ToSchema WalletOperation where
419419
declareNamedSchema _ =
420420
pure $ NamedSchema (Just "WalletOperation") $ mempty
421-
& type_ .~ SwaggerString
421+
& type_ ?~ SwaggerString
422422
& enum_ ?~ ["create", "restore"]
423423

424424
deriveSafeBuildable ''WalletOperation
@@ -548,15 +548,15 @@ instance FromJSON EstimatedCompletionTime where
548548
instance ToSchema EstimatedCompletionTime where
549549
declareNamedSchema _ =
550550
pure $ NamedSchema (Just "EstimatedCompletionTime") $ mempty
551-
& type_ .~ SwaggerObject
551+
& type_ ?~ SwaggerObject
552552
& required .~ ["quantity", "unit"]
553553
& properties .~ (mempty
554554
& at "quantity" ?~ (Inline $ mempty
555-
& type_ .~ SwaggerNumber
555+
& type_ ?~ SwaggerNumber
556556
& minimum_ .~ Just 0
557557
)
558558
& at "unit" ?~ (Inline $ mempty
559-
& type_ .~ SwaggerString
559+
& type_ ?~ SwaggerString
560560
& enum_ ?~ ["milliseconds"]
561561
)
562562
)
@@ -596,14 +596,14 @@ instance FromJSON SyncThroughput where
596596
instance ToSchema SyncThroughput where
597597
declareNamedSchema _ =
598598
pure $ NamedSchema (Just "SyncThroughput") $ mempty
599-
& type_ .~ SwaggerObject
599+
& type_ ?~ SwaggerObject
600600
& required .~ ["quantity", "unit"]
601601
& properties .~ (mempty
602602
& at "quantity" ?~ (Inline $ mempty
603-
& type_ .~ SwaggerNumber
603+
& type_ ?~ SwaggerNumber
604604
)
605605
& at "unit" ?~ (Inline $ mempty
606-
& type_ .~ SwaggerString
606+
& type_ ?~ SwaggerString
607607
& enum_ ?~ ["blocksPerSecond"]
608608
)
609609
)
@@ -685,11 +685,11 @@ instance ToSchema SyncState where
685685
declareNamedSchema _ = do
686686
syncProgress <- declareSchemaRef @SyncProgress Proxy
687687
pure $ NamedSchema (Just "SyncState") $ mempty
688-
& type_ .~ SwaggerObject
688+
& type_ ?~ SwaggerObject
689689
& required .~ ["tag"]
690690
& properties .~ (mempty
691691
& at "tag" ?~ (Inline $ mempty
692-
& type_ .~ SwaggerString
692+
& type_ ?~ SwaggerString
693693
& enum_ ?~ ["restoring", "synced"]
694694
)
695695
& at "data" ?~ syncProgress
@@ -797,7 +797,7 @@ instance Example MnemonicBalance where
797797
instance ToSchema PublicKey where
798798
declareNamedSchema _ =
799799
pure $ NamedSchema (Just "PublicKey") $ mempty
800-
& type_ .~ SwaggerString
800+
& type_ ?~ SwaggerString
801801
& format ?~ "base58"
802802

803803
--------------------------------------------------------------------------------
@@ -841,7 +841,7 @@ instance FromJSON (V1 AddressOwnership) where
841841
instance ToSchema (V1 AddressOwnership) where
842842
declareNamedSchema _ =
843843
pure $ NamedSchema (Just "V1AddressOwnership") $ mempty
844-
& type_ .~ SwaggerString
844+
& type_ ?~ SwaggerString
845845
& enum_ ?~ ["isOurs", "ambiguousOwnership"]
846846

847847
instance Arbitrary (V1 AddressOwnership) where
@@ -945,7 +945,7 @@ instance BuildableSafeGen AccountIndex where
945945

946946
instance ToParamSchema AccountIndex where
947947
toParamSchema _ = mempty
948-
& type_ .~ SwaggerNumber
948+
& type_ ?~ SwaggerNumber
949949
& minimum_ .~ Just (fromIntegral $ getAccIndex minBound)
950950
& maximum_ .~ Just (fromIntegral $ getAccIndex maxBound)
951951

@@ -1337,7 +1337,7 @@ instance FromJSON (V1 Core.InputSelectionPolicy) where
13371337
instance ToSchema (V1 Core.InputSelectionPolicy) where
13381338
declareNamedSchema _ =
13391339
pure $ NamedSchema (Just "V1InputSelectionPolicy") $ mempty
1340-
& type_ .~ SwaggerString
1340+
& type_ ?~ SwaggerString
13411341
& enum_ ?~ ["OptimizeForSecurity", "OptimizeForHighThroughput"]
13421342

13431343
instance Arbitrary (V1 Core.InputSelectionPolicy) where
@@ -1422,7 +1422,7 @@ deriveJSON defaultOptions { A.constructorTagModifier = reverse . drop 11 . rever
14221422
instance ToSchema TransactionType where
14231423
declareNamedSchema _ =
14241424
pure $ NamedSchema (Just "TransactionType") $ mempty
1425-
& type_ .~ SwaggerString
1425+
& type_ ?~ SwaggerString
14261426
& enum_ ?~ ["local", "foreign"]
14271427
& description ?~ mconcat
14281428
[ "A transaction is 'local' if all the inputs and outputs "
@@ -1454,7 +1454,7 @@ deriveJSON defaultOptions { A.constructorTagModifier = reverse . drop 11 . rever
14541454
instance ToSchema TransactionDirection where
14551455
declareNamedSchema _ =
14561456
pure $ NamedSchema (Just "TransactionDirection") $ mempty
1457-
& type_ .~ SwaggerString
1457+
& type_ ?~ SwaggerString
14581458
& enum_ ?~ ["outgoing", "incoming"]
14591459

14601460
-- | This is an information-less variant of 'PtxCondition'.
@@ -1492,17 +1492,17 @@ instance ToJSON TransactionStatus where
14921492
instance ToSchema TransactionStatus where
14931493
declareNamedSchema _ =
14941494
pure $ NamedSchema (Just "TransactionStatus") $ mempty
1495-
& type_ .~ SwaggerObject
1495+
& type_ ?~ SwaggerObject
14961496
& required .~ ["tag", "data"]
14971497
& properties .~ (mempty
14981498
& at "tag" ?~ Inline (mempty
1499-
& type_ .~ SwaggerString
1499+
& type_ ?~ SwaggerString
15001500
& enum_ ?~
15011501
map (String . transactionStatusToText)
15021502
allTransactionStatuses
15031503
)
15041504
& at "data" ?~ Inline (mempty
1505-
& type_ .~ SwaggerObject
1505+
& type_ ?~ SwaggerObject
15061506
)
15071507
)
15081508

@@ -1686,7 +1686,7 @@ instance ToSchema ShieldedRedemptionCode where
16861686
declareNamedSchema _ =
16871687
pure
16881688
$ NamedSchema (Just "ShieldedRedemptionCode") $ mempty
1689-
& type_ .~ SwaggerString
1689+
& type_ ?~ SwaggerString
16901690

16911691
deriveSafeBuildable ''ShieldedRedemptionCode
16921692
instance BuildableSafeGen ShieldedRedemptionCode where

‎wallet/src/Cardano/Wallet/Types/UtxoStatistics.hs

+3-3
Original file line numberDiff line numberDiff line change
@@ -141,16 +141,16 @@ instance ToSchema UtxoStatistics where
141141
wordRef <- declareSchemaRef (Proxy :: Proxy Word64)
142142
btypeRef <- declareSchemaRef (Proxy :: Proxy BoundType)
143143
pure $ NamedSchema (Just "UtxoStatistics") $ mempty
144-
& type_ .~ SwaggerObject
144+
& type_ ?~ SwaggerObject
145145
& required .~ ["histogram", "allStakes"]
146146
& properties .~ (mempty
147147
& at "boundType" ?~ btypeRef
148148
& at "allStakes" ?~ (Inline $ mempty
149-
& type_ .~ SwaggerNumber
149+
& type_ ?~ SwaggerNumber
150150
& minimum_ .~ Just 0
151151
)
152152
& at "histogram" ?~ Inline (mempty
153-
& type_ .~ SwaggerObject
153+
& type_ ?~ SwaggerObject
154154
& properties .~ (mempty
155155
& at "10" ?~ wordRef
156156
& at "100" ?~ wordRef

0 commit comments

Comments
 (0)