Skip to content

Commit

Permalink
Cosmetic improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@mziolekda
mziolekda committed Sep 21, 2022
1 parent 6260bba commit 7d06416
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 20 deletions.
6 changes: 3 additions & 3 deletions daml-script/test/src/com/digitalasset/daml/lf/engine/script/test/JsonApiIt.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,9 @@ final class JsonApiIt
)
val participantParams = Participants(Some(defaultParticipant), Map.empty, Map.empty)
Runner.jsonClients(participantParams, envIface).andThen { case Success(ps) =>
parties.foreach { party =>
ps.default_participant.map(_.allocateParty(party, ""))
}
Future.sequence(
parties.flatMap(party => ps.default_participant.map(_.allocateParty(party, "")))
)
}
}

Expand Down
37 changes: 20 additions & 17 deletions language-support/hs/bindings/test/DA/Ledger/Tests.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ authenticatingSandboxTests testDar =
]
where mbSecret = Just (Secret "Brexit-is-a-very-silly-idea")

allocateTestParty :: Party -> LedgerService PartyDetails
allocateTestParty party =
allocateParty AllocatePartyRequest { partyIdHint = unParty party, displayName = "" }

run :: WithSandbox -> (DarMetadata -> TestId -> LedgerService ()) -> IO ()
run withSandbox f =
Expand Down Expand Up @@ -202,7 +205,7 @@ tSubmitComplete withSandbox = testCase "tSubmitComplete" $ run withSandbox $ \Da
tCreateWithKey :: SandboxTest
tCreateWithKey withSandbox = testCase "createWithKey" $ run withSandbox $ \DarMetadata{mainPackageId} testId -> do
lid <- getLedgerIdentity
_ <- allocateParty AllocatePartyRequest { partyIdHint = unParty (alice testId), displayName = "" }
_ <- allocateTestParty (alice testId)
withGetAllTransactions lid (alice testId) (Verbosity False) $ \txs -> do
let command = createWithKey mainPackageId (alice testId) 100
_ <- fromRight =<< submitCommand lid (alice testId) command
Expand All @@ -213,7 +216,7 @@ tCreateWithKey withSandbox = testCase "createWithKey" $ run withSandbox $ \DarMe
tCreateWithoutKey :: SandboxTest
tCreateWithoutKey withSandbox = testCase "createWithoutKey" $ run withSandbox $ \DarMetadata{mainPackageId} testId -> do
lid <- getLedgerIdentity
_ <- allocateParty AllocatePartyRequest { partyIdHint = unParty (alice testId), displayName = "" }
_ <- allocateTestParty (alice testId)
withGetAllTransactions lid (alice testId) (Verbosity False) $ \txs -> do
let command = createWithoutKey mainPackageId (alice testId) 100
_ <- fromRight =<< submitCommand lid (alice testId) command
Expand All @@ -224,7 +227,7 @@ tCreateWithoutKey withSandbox = testCase "createWithoutKey" $ run withSandbox $
tStakeholders :: WithSandbox -> Tasty.TestTree
tStakeholders withSandbox = testCase "stakeholders are exposed correctly" $ run withSandbox $ \DarMetadata{mainPackageId} testId -> do
lid <- getLedgerIdentity
_ <- allocateParty AllocatePartyRequest { partyIdHint = unParty (alice testId), displayName = "" }
_ <- allocateTestParty (alice testId)
withGetTransactionsPF lid (alice testId) $ \PastAndFuture {future=txs} -> do
let command = createIOU mainPackageId (alice testId) "(alice testId)-in-chains" 100
_ <- submitCommand lid (alice testId) command
Expand All @@ -236,7 +239,7 @@ tStakeholders withSandbox = testCase "stakeholders are exposed correctly" $ run
tPastFuture :: SandboxTest
tPastFuture withSandbox = testCase "past/future" $ run withSandbox $ \DarMetadata{mainPackageId} testId -> do
lid <- getLedgerIdentity
_ <- allocateParty AllocatePartyRequest { partyIdHint = unParty (alice testId), displayName = "" }
_ <- allocateTestParty (alice testId)
let command = createIOU mainPackageId (alice testId) "A-coin" 100
withGetTransactionsPF lid (alice testId) $ \PastAndFuture {past=past1,future=future1} -> do
-- We need a submitandWait here to make sure that the
Expand All @@ -256,7 +259,7 @@ tPastFuture withSandbox = testCase "past/future" $ run withSandbox $ \DarMetadat
tGetFlatTransactionByEventId :: SandboxTest
tGetFlatTransactionByEventId withSandbox = testCase "tGetFlatTransactionByEventId" $ run withSandbox $ \DarMetadata{mainPackageId} testId -> do
lid <- getLedgerIdentity
_ <- allocateParty AllocatePartyRequest { partyIdHint = unParty (alice testId), displayName = "" }
_ <- allocateTestParty (alice testId)
withGetAllTransactions lid (alice testId) (Verbosity True) $ \txs -> do
_ <- fromRight =<< submitCommand lid (alice testId) (createIOU mainPackageId (alice testId) "A-coin" 100)
Just (Right [txOnStream]) <- liftIO $ timeout 1 (takeStream txs)
Expand All @@ -269,7 +272,7 @@ tGetFlatTransactionByEventId withSandbox = testCase "tGetFlatTransactionByEventI
tGetFlatTransactionById :: SandboxTest
tGetFlatTransactionById withSandbox = testCase "tGetFlatTransactionById" $ run withSandbox $ \DarMetadata{mainPackageId} testId -> do
lid <- getLedgerIdentity
_ <- allocateParty AllocatePartyRequest { partyIdHint = unParty (alice testId), displayName = "" }
_ <- allocateTestParty (alice testId)
withGetAllTransactions lid (alice testId) (Verbosity True) $ \txs -> do
_ <- fromRight =<< submitCommand lid (alice testId) (createIOU mainPackageId (alice testId) "A-coin" 100)
Just (Right [txOnStream]) <- liftIO $ timeout 1 (takeStream txs)
Expand All @@ -282,7 +285,7 @@ tGetFlatTransactionById withSandbox = testCase "tGetFlatTransactionById" $ run w
tGetTransactions :: SandboxTest
tGetTransactions withSandbox = testCase "tGetTransactions" $ run withSandbox $ \DarMetadata{mainPackageId} testId -> do
lid <- getLedgerIdentity
_ <- allocateParty AllocatePartyRequest { partyIdHint = unParty (alice testId), displayName = "" }
_ <- allocateTestParty (alice testId)
withGetAllTransactions lid (alice testId) (Verbosity True) $ \txs -> do
cidA <- fromRight =<< submitCommand lid (alice testId) (createIOU mainPackageId (alice testId) "A-coin" 100)
Just (Right [Transaction{cid=Just cidB}]) <- liftIO $ timeout 1 (takeStream txs)
Expand All @@ -291,7 +294,7 @@ tGetTransactions withSandbox = testCase "tGetTransactions" $ run withSandbox $ \
tGetTransactionTrees :: SandboxTest
tGetTransactionTrees withSandbox = testCase "tGetTransactionTrees" $ run withSandbox $ \DarMetadata{mainPackageId} testId -> do
lid <- getLedgerIdentity
_ <- allocateParty AllocatePartyRequest { partyIdHint = unParty (alice testId), displayName = "" }
_ <- allocateTestParty (alice testId)
withGetAllTransactionTrees lid (alice testId) (Verbosity True) $ \txs -> do
cidA <- fromRight =<< submitCommand lid (alice testId) (createIOU mainPackageId (alice testId) "A-coin" 100)
Just (Right [TransactionTree{cid=Just cidB}]) <- liftIO $ timeout 1 (takeStream txs)
Expand All @@ -300,7 +303,7 @@ tGetTransactionTrees withSandbox = testCase "tGetTransactionTrees" $ run withSan
tGetTransactionByEventId :: SandboxTest
tGetTransactionByEventId withSandbox = testCase "tGetTransactionByEventId" $ run withSandbox $ \DarMetadata{mainPackageId} testId -> do
lid <- getLedgerIdentity
_ <- allocateParty AllocatePartyRequest { partyIdHint = unParty (alice testId), displayName = "" }
_ <- allocateTestParty (alice testId)
withGetAllTransactionTrees lid (alice testId) (Verbosity True) $ \txs -> do
_ <- fromRight =<< submitCommand lid (alice testId) (createIOU mainPackageId (alice testId) "A-coin" 100)
Just (Right [txOnStream]) <- liftIO $ timeout 1 (takeStream txs)
Expand All @@ -313,7 +316,7 @@ tGetTransactionByEventId withSandbox = testCase "tGetTransactionByEventId" $ run
tGetTransactionById :: SandboxTest
tGetTransactionById withSandbox = testCase "tGetTransactionById" $ run withSandbox $ \DarMetadata{mainPackageId} testId -> do
lid <- getLedgerIdentity
_ <- allocateParty AllocatePartyRequest { partyIdHint = unParty (alice testId), displayName = "" }
_ <- allocateTestParty (alice testId)
withGetAllTransactionTrees lid (alice testId) (Verbosity True) $ \txs -> do
_ <- fromRight =<< submitCommand lid (alice testId) (createIOU mainPackageId (alice testId) "A-coin" 100)
Just (Right [txOnStream]) <- liftIO $ timeout 1 (takeStream txs)
Expand All @@ -326,7 +329,7 @@ tGetTransactionById withSandbox = testCase "tGetTransactionById" $ run withSandb
tGetActiveContracts :: SandboxTest
tGetActiveContracts withSandbox = testCase "tGetActiveContracts" $ run withSandbox $ \DarMetadata{mainPackageId} testId -> do
lid <- getLedgerIdentity
_ <- allocateParty AllocatePartyRequest { partyIdHint = unParty (alice testId), displayName = "" }
_ <- allocateTestParty (alice testId)
-- no active contracts here
[(off1,_,[])] <- getActiveContracts lid (filterEverythingForParty (alice testId)) (Verbosity True)
-- so let's create one
Expand Down Expand Up @@ -359,7 +362,7 @@ tUploadDarFileBad withSandbox = testCase "tUploadDarFileBad" $ run withSandbox $
tUploadDarFileGood :: SandboxTest
tUploadDarFileGood withSandbox = testCase "tUploadDarFileGood" $ run withSandbox $ \_darMetadata testId -> do
lid <- getLedgerIdentity
_ <- allocateParty AllocatePartyRequest { partyIdHint = unParty (alice testId), displayName = "" }
_ <- allocateTestParty (alice testId)
bytes <- liftIO getBytesForUpload
before <- listKnownPackages
pid <- uploadDarFileGetPid lid bytes >>= either (liftIO . assertFailure) return
Expand Down Expand Up @@ -443,7 +446,7 @@ tSubmitAndWait :: SandboxTest
tSubmitAndWait withSandbox =
testCase "tSubmitAndWait" $ run withSandbox $ \DarMetadata{mainPackageId} testId -> do
lid <- getLedgerIdentity
_ <- allocateParty AllocatePartyRequest { partyIdHint = unParty (alice testId), displayName = "" }
_ <- allocateTestParty (alice testId)
withGetAllTransactions lid (alice testId) (Verbosity False) $ \txs -> do
-- bad
(_cid,commands) <- liftIO $ makeCommands lid (alice testId) $ createIOU mainPackageId (bob testId) "B-coin" 100
Expand All @@ -459,7 +462,7 @@ tSubmitAndWaitForTransactionId :: SandboxTest
tSubmitAndWaitForTransactionId withSandbox =
testCase "tSubmitAndWaitForTransactionId" $ run withSandbox $ \DarMetadata{mainPackageId} testId -> do
lid <- getLedgerIdentity
_ <- allocateParty AllocatePartyRequest { partyIdHint = unParty (alice testId), displayName = "" }
_ <- allocateTestParty (alice testId)
withGetAllTransactions lid (alice testId) (Verbosity False) $ \txs -> do
-- bad
(_cid,commands) <- liftIO $ makeCommands lid (alice testId) $ createIOU mainPackageId (bob testId) "B-coin" 100
Expand All @@ -475,7 +478,7 @@ tSubmitAndWaitForTransaction :: SandboxTest
tSubmitAndWaitForTransaction withSandbox =
testCase "tSubmitAndWaitForTransaction" $ run withSandbox $ \DarMetadata{mainPackageId} testId -> do
lid <- getLedgerIdentity
_ <- allocateParty AllocatePartyRequest { partyIdHint = unParty (alice testId), displayName = "" }
_ <- allocateTestParty (alice testId)
withGetAllTransactions lid (alice testId) (Verbosity True) $ \txs -> do
-- bad
(_cid,commands) <- liftIO $ makeCommands lid (alice testId) $ createIOU mainPackageId (bob testId) "B-coin" 100
Expand All @@ -491,7 +494,7 @@ tSubmitAndWaitForTransactionTree :: SandboxTest
tSubmitAndWaitForTransactionTree withSandbox =
testCase "tSubmitAndWaitForTransactionTree" $ run withSandbox $ \DarMetadata{mainPackageId} testId -> do
lid <- getLedgerIdentity
_ <- allocateParty AllocatePartyRequest { partyIdHint = unParty (alice testId), displayName = "" }
_ <- allocateTestParty (alice testId)
withGetAllTransactionTrees lid (alice testId) (Verbosity True) $ \txs -> do
-- bad
(_cid,commands) <- liftIO $ makeCommands lid (alice testId) $ createIOU mainPackageId (bob testId) "B-coin" 100
Expand Down Expand Up @@ -560,7 +563,7 @@ tValueConversion withSandbox = testCase "tValueConversion" $ run withSandbox $ \
let args = Record Nothing [ RecordField "owner" (VParty owner), RecordField "bucket" bucket ]
let command = CreateCommand {tid,args}
lid <- getLedgerIdentity
_ <- allocateParty AllocatePartyRequest { partyIdHint = unParty (alice testId), displayName = "" }
_ <- allocateTestParty (alice testId)
_::CommandId <- submitCommand lid (alice testId) command >>= either (liftIO . assertFailure) return
withGetAllTransactions lid (alice testId) (Verbosity True) $ \txs -> do
Just elem <- liftIO $ timeout 1 (takeStream txs)
Expand Down

0 comments on commit 7d06416

Please sign in to comment.