Skip to content

Commit

Permalink
Fixup remaining compilation failures
Browse files Browse the repository at this point in the history
  • Loading branch information
@Anviking
Anviking committed Oct 1, 2020
1 parent 0c9a952 commit f00890c
Show file tree
Hide file tree
Showing 11 changed files with 177 additions and 149 deletions.
6 changes: 5 additions & 1 deletion lib/core-integration/src/Test/Integration/Framework/DSL.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@ module Test.Integration.Framework.DSL
, postExternalTransactionViaCLI
, deleteTransactionViaCLI
, getTransactionViaCLI

-- * Re-exports
, runResourceT
, ResourceT
) where

import Cardano.CLI
Expand Down Expand Up @@ -248,7 +252,7 @@ import Control.Monad.Fail
import Control.Monad.IO.Class
( MonadIO, liftIO )
import Control.Monad.Trans.Resource
( ResourceT, allocate )
( ResourceT, allocate, runResourceT )
import Control.Retry
( capDelay, constantDelay, retrying )
import Crypto.Hash
Expand Down
18 changes: 10 additions & 8 deletions lib/jormungandr/test/bench/Latency.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ import Control.Exception
( throwIO )
import Control.Monad
( mapM_, replicateM, replicateM_ )
import Control.Monad.IO.Class
( liftIO )
import Data.Aeson
( Value )
import Data.Aeson.QQ
Expand Down Expand Up @@ -113,6 +115,8 @@ import Test.Integration.Framework.DSL
, json
, listAddresses
, request
, runResourceT
, runResourceT
, verify
)

Expand Down Expand Up @@ -232,7 +236,7 @@ walletApiBench capture benchWithServer = do

replicateM_ batchSize
(postTx ctx (wSrc, Link.createTransaction @'Shelley, pass) wDest amtToSend)
eventually "repeatPostTx: wallet balance is as expected" $ do
liftIO $ eventually "repeatPostTx: wallet balance is as expected" $ do
rWal1 <- request @ApiWallet ctx (Link.getWallet @'Shelley wDest) Default Empty
verify rWal1
[ expectSuccess
Expand All @@ -242,7 +246,7 @@ walletApiBench capture benchWithServer = do
]

rDel <- request @ApiWallet ctx (Link.deleteWallet @'Shelley wSrc) Default Empty
expectResponseCode @IO HTTP.status204 rDel
expectResponseCode HTTP.status204 rDel

pure ()

Expand All @@ -269,7 +273,7 @@ walletApiBench capture benchWithServer = do
postMultiTx ctx
(wSrc, Link.createTransaction @'Shelley, fixturePassphrase)
wDest amtToSend batchSize
eventually "repeatPostMultiTx: wallet balance is as expected" $ do
liftIO $ eventually "repeatPostMultiTx: wallet balance is as expected" $ do
rWal1 <- request @ApiWallet ctx
(Link.getWallet @'Shelley wDest) Default Empty
verify rWal1
Expand All @@ -280,11 +284,11 @@ walletApiBench capture benchWithServer = do
]

rStat <- request @ApiUtxoStatistics ctx (Link.getUTxOsStatistics @'Shelley wDest) Default Empty
expectResponseCode @IO HTTP.status200 rStat
expectResponseCode HTTP.status200 rStat
expectWalletUTxO utxoExp (snd rStat)

rDel <- request @ApiWallet ctx (Link.deleteWallet @'Shelley wSrc) Default Empty
expectResponseCode @IO HTTP.status204 rDel
expectResponseCode HTTP.status204 rDel

pure ()

Expand All @@ -309,9 +313,7 @@ walletApiBench capture benchWithServer = do
expectResponseCode HTTP.status202 r
return ()

runScenario scenario = benchWithServer $ \ctx -> do
(wal1, wal2) <- scenario ctx

runScenario scenario = benchWithServer $ \ctx -> runResourceT $ scenario ctx >>= \(wal1, wal2) -> liftIO $ do
t1 <- measureApiLogs capture
(request @[ApiWallet] ctx (Link.listWallets @'Shelley) Default Empty)

Expand Down
41 changes: 21 additions & 20 deletions lib/jormungandr/test/integration/Test/Integration/Jormungandr/Scenario/API/Addresses.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ import Test.Integration.Framework.DSL
, listAddresses
, minUTxOValue
, request
, runResourceT
, verify
, walletId
)
Expand All @@ -70,62 +71,62 @@ spec :: forall n t.
, EncodeAddress n
) => SpecWith (Context t)
spec = describe "SHELLEY_ADDRESSES" $ do
it "BYRON_ADDRESS_LIST - Byron wallet on Shelley ep" $ \ctx -> do
it "BYRON_ADDRESS_LIST - Byron wallet on Shelley ep" $ \ctx -> runResourceT $ do
w <- emptyRandomWallet ctx
let wid = w ^. walletId
let ep = ("GET", "v2/wallets/" <> wid <> "/addresses")
r <- request @[ApiAddress n] ctx ep Default Empty
expectResponseCode @IO HTTP.status404 r
expectResponseCode HTTP.status404 r
expectErrorMessage (errMsg404NoWallet wid) r

it "ADDRESS_LIST_01 - Can list known addresses on a default wallet" $ \ctx -> do
it "ADDRESS_LIST_01 - Can list known addresses on a default wallet" $ \ctx -> runResourceT $ do
let g = fromIntegral $ getAddressPoolGap defaultAddressPoolGap
w <- emptyWallet ctx
r <- request @[ApiAddress n] ctx
(Link.listAddresses @'Shelley w) Default Empty
expectResponseCode @IO HTTP.status200 r
expectResponseCode HTTP.status200 r
expectListSize g r
forM_ [0..(g-1)] $ \addrNum -> do
expectListField addrNum (#state . #getApiT) (`shouldBe` Unused) r

it "ADDRESS_LIST_01 - Can list addresses with non-default pool gap" $ \ctx -> do
it "ADDRESS_LIST_01 - Can list addresses with non-default pool gap" $ \ctx -> runResourceT $ do
let g = 15
w <- emptyWalletWith ctx ("Wallet", "cardano-wallet", g)
r <- request @[ApiAddress n] ctx
(Link.listAddresses @'Shelley w) Default Empty
expectResponseCode @IO HTTP.status200 r
expectResponseCode HTTP.status200 r
expectListSize g r
forM_ [0..(g-1)] $ \addrNum -> do
expectListField addrNum (#state . #getApiT) (`shouldBe` Unused) r

it "ADDRESS_LIST_02 - Can filter used and unused addresses" $ \ctx -> do
it "ADDRESS_LIST_02 - Can filter used and unused addresses" $ \ctx -> runResourceT $ do
let g = fromIntegral $ getAddressPoolGap defaultAddressPoolGap
w <- fixtureWallet ctx
rUsed <- request @[ApiAddress n] ctx
(Link.listAddresses' @'Shelley w (Just Used)) Default Empty
expectResponseCode @IO HTTP.status200 rUsed
expectResponseCode HTTP.status200 rUsed
expectListSize 10 rUsed
forM_ [0..9] $ \addrNum -> do
expectListField
addrNum (#state . #getApiT) (`shouldBe` Used) rUsed
rUnused <- request @[ApiAddress n] ctx
(Link.listAddresses' @'Shelley w (Just Unused)) Default Empty
expectResponseCode @IO HTTP.status200 rUnused
expectResponseCode HTTP.status200 rUnused
expectListSize g rUnused
forM_ [10..(g-1)] $ \addrNum -> do
expectListField
addrNum (#state . #getApiT) (`shouldBe` Unused) rUnused

it "ADDRESS_LIST_02 - Shows nothing when there are no used addresses"
$ \ctx -> do
$ \ctx -> runResourceT $ do
w <- emptyWallet ctx
rUsed <- request @[ApiAddress n] ctx
(Link.listAddresses' @'Shelley w (Just Used)) Default Empty
rUnused <- request @[ApiAddress n] ctx
(Link.listAddresses' @'Shelley w (Just Unused)) Default Empty
expectResponseCode @IO HTTP.status200 rUsed
expectResponseCode HTTP.status200 rUsed
expectListSize 0 rUsed
expectResponseCode @IO HTTP.status200 rUnused
expectResponseCode HTTP.status200 rUnused
expectListSize 20 rUnused
forM_ [0..19] $ \addrNum -> do
expectListField
Expand All @@ -147,19 +148,19 @@ spec = describe "SHELLEY_ADDRESSES" $ do
]

let withQuery f (method, link) = (method, link <> "?state=" <> T.pack f)
forM_ filters $ \fil -> it fil $ \ctx -> do
forM_ filters $ \fil -> it fil $ \ctx -> runResourceT $ do
w <- emptyWallet ctx
let link = withQuery fil $ Link.listAddresses @'Shelley w
r <- request @[ApiAddress n] ctx link Default Empty
verify r
[ expectResponseCode @IO HTTP.status400
[ expectResponseCode HTTP.status400
, expectErrorMessage $
"Error parsing query parameter state failed: Unable to\
\ decode the given value: '" <> fil <> "'. Please specify\
\ one of the following values: used, unused."
]

it "ADDRESS_LIST_03 - Generates new address pool gap" $ \ctx -> do
it "ADDRESS_LIST_03 - Generates new address pool gap" $ \ctx -> runResourceT $ do
let initPoolGap = 10
wSrc <- fixtureWallet ctx
wDest <- emptyWalletWith ctx ("Wallet", "cardano-wallet", initPoolGap)
Expand All @@ -168,7 +169,7 @@ spec = describe "SHELLEY_ADDRESSES" $ do
r <- request @[ApiAddress n] ctx
(Link.listAddresses @'Shelley wDest) Default Empty
verify r
[ expectResponseCode @IO HTTP.status200
[ expectResponseCode HTTP.status200
, expectListSize initPoolGap
]
forM_ [0..9] $ \addrNum -> do
Expand All @@ -191,7 +192,7 @@ spec = describe "SHELLEY_ADDRESSES" $ do

rTrans <- request @(ApiTransaction n) ctx
(Link.createTransaction @'Shelley wSrc) Default payload
expectResponseCode @IO HTTP.status202 rTrans
expectResponseCode HTTP.status202 rTrans

-- make sure all transactions are in ledger
eventually "Wallet balance = initPoolGap * minUTxOValue" $ do
Expand All @@ -206,7 +207,7 @@ spec = describe "SHELLEY_ADDRESSES" $ do
rAddr <- request @[ApiAddress n] ctx
(Link.listAddresses @'Shelley wDest) Default Empty
verify rAddr
[ expectResponseCode @IO HTTP.status200
[ expectResponseCode HTTP.status200
, expectListSize 20
]
forM_ [0..9] $ \addrNum -> do
Expand All @@ -216,11 +217,11 @@ spec = describe "SHELLEY_ADDRESSES" $ do
expectListField
addrNum (#state . #getApiT) (`shouldBe` Unused) rAddr

it "ADDRESS_LIST_04 - Deleted wallet" $ \ctx -> do
it "ADDRESS_LIST_04 - Deleted wallet" $ \ctx -> runResourceT $ do
w <- emptyWallet ctx
_ <- request @ApiWallet ctx
(Link.deleteWallet @'Shelley w) Default Empty
r <- request @[ApiAddress n] ctx
(Link.listAddresses @'Shelley w) Default Empty
expectResponseCode @IO HTTP.status404 r
expectResponseCode HTTP.status404 r
expectErrorMessage (errMsg404NoWallet $ w ^. walletId) r
Loading

0 comments on commit f00890c

Please sign in to comment.