Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

JSON API Upgrades: ETX-500 require fully qualified template ids #19149

Merged
merged 17 commits into from
May 10, 2024
Merged

JSON API Upgrades: ETX-500 require fully qualified template ids #19149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
70f6e11
require fully qualified template ids in /create
May 1, 2024
8b07f36
require fully-qualified template ids in /create-and-exercise
May 1, 2024
d5efa5c
require fully qualified template ids in /exercise
May 1, 2024
42eddc5
fix create-and-exercise so unresolved are fully-qualified too
May 1, 2024
8b566d2
update EnrichedContractKey and EnrichedContractId to use RequiredPkg
May 2, 2024
821fe3a
require fully qualified template ids in HTTP /query
May 2, 2024
5cfde21
remove all uses of OptionalPkg
May 3, 2024
2db79a4
scalafmt
May 3, 2024
ec90646
undo incidental changes
May 3, 2024
325b992
replace tidString function with fqn method, which is more concise
May 3, 2024
3234bed
further simplification and fix cast
May 3, 2024
146070d
fix test-evidence
May 3, 2024
8518472
fmt
May 3, 2024
9a42233
update unrelated tests to use a package ref
May 5, 2024
5d26841
added unit test for template id with missing package reference
May 6, 2024
5e547a9
a little bit of tidying
May 6, 2024
4162716
remove commented import
May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 12 additions & 7 deletions sdk/daml-assistant/integration-tests/src/DA/Daml/Assistant/IntegrationTests.hs
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ withDamlServiceIn path command args act = withDevNull $ \devNull -> do
data DamlStartResource = DamlStartResource data DamlStartResource = DamlStartResource
{ projDir :: FilePath { projDir :: FilePath
, tmpDir :: FilePath , tmpDir :: FilePath
, packageRef :: String
, alice :: String , alice :: String
, aliceHeaders :: RequestHeaders , aliceHeaders :: RequestHeaders
, startStdin :: Handle , startStdin :: Handle
Expand Down Expand Up @@ -161,10 +162,13 @@ damlStart tmpDir _disableUpgradeValidation = do
(authorizationHeaders "Alice") -- dummy party here, not important (authorizationHeaders "Alice") -- dummy party here, not important
scriptOutput <- readFileUTF8 (projDir </> scriptOutputFile) scriptOutput <- readFileUTF8 (projDir </> scriptOutputFile)
let alice = (read scriptOutput :: String) let alice = (read scriptOutput :: String)
-- TODO(raphael-speyer-da): Use a package name once supported by canton out of the box.
let packageRef = "6310b9aa3d506211b592dd657afb167d63637453f31eae986fad5aa1b6d61401"
pure $ pure $
DamlStartResource DamlStartResource
{ projDir = projDir { projDir = projDir
, tmpDir = tmpDir , tmpDir = tmpDir
, packageRef = packageRef
, sandboxPort = ledger ports , sandboxPort = ledger ports
, jsonApiPort = jsonApiPort , jsonApiPort = jsonApiPort
, startStdin = startStdin , startStdin = startStdin
Expand Down Expand Up @@ -334,7 +338,7 @@ damlStartTests getDamlStart =
let subtest :: forall t. String -> IO t -> IO t let subtest :: forall t. String -> IO t -> IO t
subtest m p = step m >> p subtest m p = step m >> p
subtest "sandbox and json-api come up" $ do subtest "sandbox and json-api come up" $ do
DamlStartResource {jsonApiPort, alice, aliceHeaders} <- getDamlStart DamlStartResource {jsonApiPort, alice, aliceHeaders, packageRef} <- getDamlStart
manager <- newManager defaultManagerSettings manager <- newManager defaultManagerSettings
initialRequest <- initialRequest <-
parseRequest $ "http://localhost:" <> show jsonApiPort <> "/v1/create" parseRequest $ "http://localhost:" <> show jsonApiPort <> "/v1/create"
Expand All @@ -346,7 +350,7 @@ damlStartTests getDamlStart =
RequestBodyLBS $ RequestBodyLBS $
Aeson.encode $ Aeson.encode $
Aeson.object Aeson.object
[ "templateId" Aeson..= Aeson.String "Main:T" [ "templateId" Aeson..= (packageRef ++ ":Main:T")
, "payload" Aeson..= [alice] , "payload" Aeson..= [alice]
] ]
} }
Expand All @@ -363,15 +367,15 @@ damlStartTests getDamlStart =
callCommandSilentIn projDir $ unwords callCommandSilentIn projDir $ unwords
["daml", "ledger", "allocate-party", "--port", show sandboxPort, "Bob"] ["daml", "ledger", "allocate-party", "--port", show sandboxPort, "Bob"]
subtest "Run init-script" $ do subtest "Run init-script" $ do
DamlStartResource {jsonApiPort, aliceHeaders} <- getDamlStart DamlStartResource {jsonApiPort, aliceHeaders, packageRef} <- getDamlStart
initialRequest <- parseRequest $ "http://localhost:" <> show jsonApiPort <> "/v1/query" initialRequest <- parseRequest $ "http://localhost:" <> show jsonApiPort <> "/v1/query"
let queryRequest = initialRequest let queryRequest = initialRequest
{ method = "POST" { method = "POST"
, requestHeaders = aliceHeaders , requestHeaders = aliceHeaders
, requestBody = , requestBody =
RequestBodyLBS $ RequestBodyLBS $
Aeson.encode $ Aeson.encode $
Aeson.object ["templateIds" Aeson..= [Aeson.String "Main:T"]] Aeson.object ["templateIds" Aeson..= [packageRef ++ ":Main:T"]]
} }
manager <- newManager defaultManagerSettings manager <- newManager defaultManagerSettings
queryResponse <- httpLbs queryRequest manager queryResponse <- httpLbs queryRequest manager
Expand Down Expand Up @@ -458,7 +462,7 @@ damlStartTestsWithoutValidation :: SdkVersioned => IO DamlStartResource -> TestT
damlStartTestsWithoutValidation getDamlStart = damlStartTestsWithoutValidation getDamlStart =
-- We use testCaseSteps to make sure each of these tests runs in sequence, not in parallel. -- We use testCaseSteps to make sure each of these tests runs in sequence, not in parallel.
testCase "daml start without upgrade validation - hot reload" $ do testCase "daml start without upgrade validation - hot reload" $ do
DamlStartResource {projDir, jsonApiPort, startStdin, stdoutChan, alice, aliceHeaders} <- getDamlStart DamlStartResource {projDir, jsonApiPort, startStdin, stdoutChan, alice, aliceHeaders, packageRef} <- getDamlStart
stdoutReadChan <- atomically $ dupTChan stdoutChan stdoutReadChan <- atomically $ dupTChan stdoutChan
writeFileUTF8 (projDir </> "daml/Main.daml") $ writeFileUTF8 (projDir </> "daml/Main.daml") $
unlines unlines
Expand All @@ -478,6 +482,7 @@ damlStartTestsWithoutValidation getDamlStart =
untilM_ (pure ()) $ do untilM_ (pure ()) $ do
line <- atomically $ readTChan stdoutReadChan line <- atomically $ readTChan stdoutReadChan
pure ("Rebuild complete" `isInfixOf` line) pure ("Rebuild complete" `isInfixOf` line)
let newPackageRef = "8caa3f3b63b66d0338e0bb8b931c5c57644a4362b3bd82c482bd37d7438abcc8"
initialRequest <- initialRequest <-
parseRequest $ "http://localhost:" <> show jsonApiPort <> "/v1/query" parseRequest $ "http://localhost:" <> show jsonApiPort <> "/v1/query"
manager <- newManager defaultManagerSettings manager <- newManager defaultManagerSettings
Expand All @@ -488,7 +493,7 @@ damlStartTestsWithoutValidation getDamlStart =
, requestBody = , requestBody =
RequestBodyLBS $ RequestBodyLBS $
Aeson.encode $ Aeson.encode $
Aeson.object ["templateIds" Aeson..= [Aeson.String "Main:T"]] Aeson.object ["templateIds" Aeson..= [packageRef ++ ":Main:T"]]
} }
let queryRequestS = let queryRequestS =
initialRequest initialRequest
Expand All @@ -497,7 +502,7 @@ damlStartTestsWithoutValidation getDamlStart =
, requestBody = , requestBody =
RequestBodyLBS $ RequestBodyLBS $
Aeson.encode $ Aeson.encode $
Aeson.object ["templateIds" Aeson..= [Aeson.String "Main:S"]] Aeson.object ["templateIds" Aeson..= [newPackageRef ++ ":Main:S"]]
} }
queryResponseT <- httpLbs queryRequestT manager queryResponseT <- httpLbs queryRequestT manager
queryResponseS <- httpLbs queryRequestS manager queryResponseS <- httpLbs queryRequestS manager
Expand Down
1 change: 1 addition & 0 deletions sdk/language-support/ts/codegen/tests/BUILD.bazel
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ daml_compile(
name = "hidden", name = "hidden",
srcs = ["daml/Hidden.daml"], srcs = ["daml/Hidden.daml"],
data_dependencies = ["//language-support/ts/codegen/tests:build-and-lint.dar"], data_dependencies = ["//language-support/ts/codegen/tests:build-and-lint.dar"],
project_name = "hidden",
target = "1.dev", target = "1.dev",
) )


Expand Down
2 changes: 1 addition & 1 deletion sdk/language-support/ts/codegen/tests/ts/build-and-lint-test/src/__tests__/test.ts
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -917,7 +917,7 @@ describe("interfaces", () => {
// meaningful we *must not* codegen or load Hidden // meaningful we *must not* codegen or load Hidden
type NotVisibleInTs = { owner: Party }; type NotVisibleInTs = { owner: Party };
const NotVisibleInTs: Pick<Template<{ owner: Party }>, "templateId"> = { const NotVisibleInTs: Pick<Template<{ owner: Party }>, "templateId"> = {
templateId: "Hidden:NotVisibleInTs", templateId: "#hidden:Hidden:NotVisibleInTs",
}; };
const initialPayload: NotVisibleInTs = { owner: ALICE_PARTY }; const initialPayload: NotVisibleInTs = { owner: ALICE_PARTY };


Expand Down
4 changes: 2 additions & 2 deletions sdk/ledger-service/fetch-contracts/src/main/scala/fetchcontracts/domain/ContractTypeId.scala
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ sealed abstract class ContractTypeId[+PkgId]
import scala.util.hashing.{MurmurHash3 => H} import scala.util.hashing.{MurmurHash3 => H}
H.productHash(this, H.productSeed, ignorePrefix = true) H.productHash(this, H.productSeed, ignorePrefix = true)
} }

def fqn: String = s"${packageId.toString}:${moduleName}:${entityName}"
} }


object ResolvedQuery { object ResolvedQuery {
Expand Down Expand Up @@ -240,9 +242,7 @@ object ContractTypeId extends ContractTypeIdLike[ContractTypeId] {


/** A contract type ID companion. */ /** A contract type ID companion. */
sealed abstract class ContractTypeIdLike[CtId[T] <: ContractTypeId[T]] { sealed abstract class ContractTypeIdLike[CtId[T] <: ContractTypeId[T]] {
type OptionalPkg = CtId[Option[String]]
type RequiredPkg = CtId[String] type RequiredPkg = CtId[String]
type NoPkg = CtId[Unit]
type Resolved = ContractTypeId.ResolvedOf[CtId] type Resolved = ContractTypeId.ResolvedOf[CtId]


// treat the companion like a typeclass instance // treat the companion like a typeclass instance
Expand Down
15 changes: 9 additions & 6 deletions ...edger-service/http-json-testing/src/main/scala/com/daml/http/HttpServiceTestFixture.scala
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ object HttpServiceTestFixture extends LazyLogging with Assertions with Inside {


private val doNotReloadPackages = FiniteDuration(100, DAYS) private val doNotReloadPackages = FiniteDuration(100, DAYS)


// This may need to be updated if the Account.daml is updated.
val staticPkgIdAccount = "b3c9564bb7334bfd0f82099893eba518afc3b68a4d5c66cb2835498252db93e9"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code does not currently depend on the integration-tests-lib, which reads current package ids of each package. The package ids are not expected to be updated often, but we help ensure this value is kept up-to-date with this assertion
https://github.com/digital-asset/daml/pull/19149/files?diff=split&w=1#diff-f3396356d430497a19c0ec5e05f9a95cb546414b908043c6037c70eb1d869eb3R76


def withHttpService[A]( def withHttpService[A](
testName: String, testName: String,
ledgerPort: Port, ledgerPort: Port,
Expand Down Expand Up @@ -416,7 +419,7 @@ object HttpServiceTestFixture extends LazyLogging with Assertions with Inside {
postJsonStringRequest(uri, json.prettyPrint, headers) postJsonStringRequest(uri, json.prettyPrint, headers)


def postCreateCommand( def postCreateCommand(
cmd: domain.CreateCommand[v.Record, domain.ContractTypeId.Template.OptionalPkg], cmd: domain.CreateCommand[v.Record, domain.ContractTypeId.Template.RequiredPkg],
encoder: DomainJsonEncoder, encoder: DomainJsonEncoder,
uri: Uri, uri: Uri,
headers: List[HttpHeader], headers: List[HttpHeader],
Expand All @@ -432,7 +435,7 @@ object HttpServiceTestFixture extends LazyLogging with Assertions with Inside {
} }


def postArchiveCommand( def postArchiveCommand(
templateId: domain.ContractTypeId.OptionalPkg, templateId: domain.ContractTypeId.RequiredPkg,
contractId: domain.ContractId, contractId: domain.ContractId,
encoder: DomainJsonEncoder, encoder: DomainJsonEncoder,
uri: Uri, uri: Uri,
Expand Down Expand Up @@ -484,8 +487,8 @@ object HttpServiceTestFixture extends LazyLogging with Assertions with Inside {
owner: domain.Party, owner: domain.Party,
number: String, number: String,
time: v.Value.Sum.Timestamp = TimestampConversion.roundInstantToMicros(Instant.now), time: v.Value.Sum.Timestamp = TimestampConversion.roundInstantToMicros(Instant.now),
): domain.CreateCommand[v.Record, domain.ContractTypeId.Template.OptionalPkg] = { ): domain.CreateCommand[v.Record, domain.ContractTypeId.Template.RequiredPkg] = {
val templateId = domain.ContractTypeId.Template(None, "Account", "Account") val templateId = domain.ContractTypeId.Template(staticPkgIdAccount, "Account", "Account")
val timeValue = v.Value(time) val timeValue = v.Value(time)
val enabledVariantValue = val enabledVariantValue =
v.Value(v.Value.Sum.Variant(v.Variant(None, "Enabled", Some(timeValue)))) v.Value(v.Value.Sum.Variant(v.Variant(None, "Enabled", Some(timeValue))))
Expand All @@ -504,8 +507,8 @@ object HttpServiceTestFixture extends LazyLogging with Assertions with Inside {
owners: Seq[domain.Party], owners: Seq[domain.Party],
number: String, number: String,
time: v.Value.Sum.Timestamp = TimestampConversion.roundInstantToMicros(Instant.now), time: v.Value.Sum.Timestamp = TimestampConversion.roundInstantToMicros(Instant.now),
): domain.CreateCommand[v.Record, domain.ContractTypeId.Template.OptionalPkg] = { ): domain.CreateCommand[v.Record, domain.ContractTypeId.Template.RequiredPkg] = {
val templateId = domain.ContractTypeId.Template(None, "Account", "SharedAccount") val templateId = domain.ContractTypeId.Template(staticPkgIdAccount, "Account", "SharedAccount")
val timeValue = v.Value(time) val timeValue = v.Value(time)
val ownersEnc = v.Value( val ownersEnc = v.Value(
v.Value.Sum.List(v.List(domain.Party.unsubst(owners).map(o => v.Value(v.Value.Sum.Party(o))))) v.Value.Sum.List(v.List(domain.Party.unsubst(owners).map(o => v.Value(v.Value.Sum.Party(o)))))
Expand Down
8 changes: 4 additions & 4 deletions sdk/ledger-service/http-json/src/failurelib/scala/http/FailureTests.scala
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ abstract class FailureTests
) )
) )
_ = status shouldBe StatusCodes.OK _ = status shouldBe StatusCodes.OK
query = jsObject("""{"templateIds": ["Account:Account"]}""") query = jsObject(s"""{"templateIds": ["$staticPkgIdAccount:Account:Account"]}""")
(status, output) <- headersWithParties(List(p)).flatMap( (status, output) <- headersWithParties(List(p)).flatMap(
postRequest( postRequest(
uri = uri.withPath(Uri.Path("/v1/query")), uri = uri.withPath(Uri.Path("/v1/query")),
Expand Down Expand Up @@ -276,7 +276,7 @@ abstract class FailureTests
) )
) )
_ = status shouldBe StatusCodes.OK _ = status shouldBe StatusCodes.OK
query = jsObject("""{"templateIds": ["Account:Account"]}""") query = jsObject(s"""{"templateIds": ["$staticPkgIdAccount:Account:Account"]}""")
(status, output) <- headersWithParties(List(p)).flatMap( (status, output) <- headersWithParties(List(p)).flatMap(
postRequest( postRequest(
uri = uri.withPath(Uri.Path("/v1/query")), uri = uri.withPath(Uri.Path("/v1/query")),
Expand Down Expand Up @@ -339,8 +339,8 @@ abstract class FailureTests
"/v1/stream/query can reconnect" taggedAs availabilitySecurity in withHttpService { "/v1/stream/query can reconnect" taggedAs availabilitySecurity in withHttpService {
(uri, encoder, _, client) => (uri, encoder, _, client) =>
val query = val query =
"""[ s"""[
{"templateIds": ["Account:Account"]} {"templateIds": ["$staticPkgIdAccount:Account:Account"]}
]""" ]"""


val offset = Promise[Offset]() val offset = Promise[Offset]()
Expand Down
50 changes: 23 additions & 27 deletions sdk/ledger-service/http-json/src/it/scala/http/HttpServiceIntegrationTest.scala
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ abstract class HttpServiceIntegrationTest
import util.ErrorOps._ import util.ErrorOps._
import com.daml.jwt.domain.Jwt import com.daml.jwt.domain.Jwt


val command0: domain.CreateCommand[v.Record, domain.ContractTypeId.Template.OptionalPkg] = val command0: domain.CreateCommand[v.Record, domain.ContractTypeId.Template.RequiredPkg] =
iouCreateCommand(domain.Party("Alice")) iouCreateCommand(domain.Party("Alice"))


type F[A] = EitherT[Future, JsonError, A] type F[A] = EitherT[Future, JsonError, A]
Expand All @@ -139,7 +139,7 @@ abstract class HttpServiceIntegrationTest
): F[JsValue] ): F[JsValue]
command1 <- (EitherT.rightT(jwt(uri)): F[Jwt]) command1 <- (EitherT.rightT(jwt(uri)): F[Jwt])
.flatMap(decoder.decodeCreateCommand(jsVal, _, fixture.ledgerId)) .flatMap(decoder.decodeCreateCommand(jsVal, _, fixture.ledgerId))
} yield command1.bimap(removeRecordId, removePackageId) should ===(command0) } yield command1.bimap(removeRecordId, identity) should ===(command0)


(x.run: Future[JsonError \/ Assertion]).map(_.fold(e => fail(e.shows), identity)) (x.run: Future[JsonError \/ Assertion]).map(_.fold(e => fail(e.shows), identity))
} }
Expand Down Expand Up @@ -178,8 +178,8 @@ abstract class HttpServiceIntegrationTest


def createIouAndExerciseTransfer( def createIouAndExerciseTransfer(
fixture: UriFixture with EncoderFixture, fixture: UriFixture with EncoderFixture,
initialTplId: domain.ContractTypeId.Template.OptionalPkg, initialTplId: domain.ContractTypeId.Template.RequiredPkg,
exerciseTid: domain.ContractTypeId.OptionalPkg, exerciseTid: domain.ContractTypeId.RequiredPkg,
choice: TExercise[_] = tExercise(choiceArgType = echoTextVA)(echoTextSample), choice: TExercise[_] = tExercise(choiceArgType = echoTextVA)(echoTextSample),
) = for { ) = for {
aliceH <- fixture.getUniquePartyAndAuthHeaders("Alice") aliceH <- fixture.getUniquePartyAndAuthHeaders("Alice")
Expand Down Expand Up @@ -210,17 +210,13 @@ abstract class HttpServiceIntegrationTest
inside(exerciseTest) { case domain.OkResponse(er, None, StatusCodes.OK) => inside(exerciseTest) { case domain.OkResponse(er, None, StatusCodes.OK) =>
inside(jdecode[String](er.exerciseResult)) { case \/-(decoded) => decoded } inside(jdecode[String](er.exerciseResult)) { case \/-(decoded) => decoded }
} }
object Transferrable {
val Transferrable: domain.ContractTypeId.Interface.OptionalPkg =
domain.ContractTypeId.Interface(None, "Transferrable", "Transferrable")
}


"templateId = interface ID" in withHttpService { fixture => "templateId = interface ID" in withHttpService { fixture =>
for { for {
_ <- uploadPackage(fixture)(ciouDar) _ <- uploadPackage(fixture)(ciouDar)
result <- createIouAndExerciseTransfer( result <- createIouAndExerciseTransfer(
fixture, fixture,
initialTplId = domain.ContractTypeId.Template(None, "IIou", "TestIIou"), initialTplId = TpId.IIou.TestIIou,
// whether we can exercise by interface-ID // whether we can exercise by interface-ID
exerciseTid = TpId.IIou.IIou, exerciseTid = TpId.IIou.IIou,
) map exerciseSucceeded ) map exerciseSucceeded
Expand All @@ -234,9 +230,9 @@ abstract class HttpServiceIntegrationTest
_ <- uploadPackage(fixture)(ciouDar) _ <- uploadPackage(fixture)(ciouDar)
result <- createIouAndExerciseTransfer( result <- createIouAndExerciseTransfer(
fixture, fixture,
initialTplId = CIou.CIou, initialTplId = TpId.CIou.CIou,
// whether we can exercise inherited by concrete template ID // whether we can exercise inherited by concrete template ID
exerciseTid = CIou.CIou, exerciseTid = TpId.CIou.CIou,
) map exerciseSucceeded ) map exerciseSucceeded
} yield result should ===("Bob invoked IIou.Transfer") } yield result should ===("Bob invoked IIou.Transfer")
} }
Expand All @@ -246,8 +242,8 @@ abstract class HttpServiceIntegrationTest
_ <- uploadPackage(fixture)(ciouDar) _ <- uploadPackage(fixture)(ciouDar)
result <- createIouAndExerciseTransfer( result <- createIouAndExerciseTransfer(
fixture, fixture,
initialTplId = CIou.CIou, initialTplId = TpId.CIou.CIou,
exerciseTid = CIou.CIou, exerciseTid = TpId.CIou.CIou,
choice = tExercise(choiceInterfaceId = Some(TpId.IIou.IIou), choiceArgType = echoTextVA)( choice = tExercise(choiceInterfaceId = Some(TpId.IIou.IIou), choiceArgType = echoTextVA)(
echoTextSample echoTextSample
), ),
Expand All @@ -261,8 +257,8 @@ abstract class HttpServiceIntegrationTest
_ <- uploadPackage(fixture)(ciouDar) _ <- uploadPackage(fixture)(ciouDar)
result <- createIouAndExerciseTransfer( result <- createIouAndExerciseTransfer(
fixture, fixture,
initialTplId = CIou.CIou, initialTplId = TpId.CIou.CIou,
exerciseTid = CIou.CIou, exerciseTid = TpId.CIou.CIou,
choice = tExercise(choiceName = "Overridden", choiceArgType = echoTextPairVA)( choice = tExercise(choiceName = "Overridden", choiceArgType = echoTextPairVA)(
ShRecord(echo = ShRecord(_1 = "yes", _2 = "no")) ShRecord(echo = ShRecord(_1 = "yes", _2 = "no"))
), ),
Expand All @@ -276,9 +272,9 @@ abstract class HttpServiceIntegrationTest
_ <- uploadPackage(fixture)(ciouDar) _ <- uploadPackage(fixture)(ciouDar)
result <- createIouAndExerciseTransfer( result <- createIouAndExerciseTransfer(
fixture, fixture,
initialTplId = CIou.CIou, initialTplId = TpId.CIou.CIou,
exerciseTid = CIou.CIou, exerciseTid = TpId.CIou.CIou,
choice = tExercise(Some(Transferrable.Transferrable), "Overridden", echoTextVA)( choice = tExercise(Some(TpId.Transferrable.Transferrable), "Overridden", echoTextVA)(
ShRecord(echo = "yesyes") ShRecord(echo = "yesyes")
), ),
) map exerciseSucceeded ) map exerciseSucceeded
Expand All @@ -290,8 +286,8 @@ abstract class HttpServiceIntegrationTest
_ <- uploadPackage(fixture)(ciouDar) _ <- uploadPackage(fixture)(ciouDar)
response <- createIouAndExerciseTransfer( response <- createIouAndExerciseTransfer(
fixture, fixture,
initialTplId = CIou.CIou, initialTplId = TpId.CIou.CIou,
exerciseTid = CIou.CIou, exerciseTid = TpId.CIou.CIou,
choice = tExercise(choiceName = "Ambiguous", choiceArgType = echoTextVA)( choice = tExercise(choiceName = "Ambiguous", choiceArgType = echoTextVA)(
ShRecord(echo = "ambiguous-test") ShRecord(echo = "ambiguous-test")
), ),
Expand All @@ -308,8 +304,8 @@ abstract class HttpServiceIntegrationTest
_ <- uploadPackage(fixture)(ciouDar) _ <- uploadPackage(fixture)(ciouDar)
result <- createIouAndExerciseTransfer( result <- createIouAndExerciseTransfer(
fixture, fixture,
initialTplId = CIou.CIou, initialTplId = TpId.CIou.CIou,
exerciseTid = CIou.CIou, exerciseTid = TpId.CIou.CIou,
choice = tExercise(choiceName = "TransferPlease", choiceArgType = echoTextVA)( choice = tExercise(choiceName = "TransferPlease", choiceArgType = echoTextVA)(
echoTextSample echoTextSample
), ),
Expand All @@ -326,7 +322,7 @@ abstract class HttpServiceIntegrationTest
aliceH <- fixture.getUniquePartyAndAuthHeaders("Alice") aliceH <- fixture.getUniquePartyAndAuthHeaders("Alice")
(alice, aliceHeaders) = aliceH (alice, aliceHeaders) = aliceH
createTest <- postCreateCommand( createTest <- postCreateCommand(
iouCommand(alice, CIou.CIou), iouCommand(alice, TpId.CIou.CIou),
fixture, fixture,
aliceHeaders, aliceHeaders,
) )
Expand All @@ -337,7 +333,7 @@ abstract class HttpServiceIntegrationTest
encodeExercise(encoder)( encodeExercise(encoder)(
iouTransfer( iouTransfer(
domain.EnrichedContractKey( domain.EnrichedContractKey(
TpId.unsafeCoerce[domain.ContractTypeId.Template, Option[String]](TpId.IIou.IIou), TpId.unsafeCoerce[domain.ContractTypeId.Template, String](TpId.IIou.IIou),
v.Value(v.Value.Sum.Party(domain.Party unwrap alice)), v.Value(v.Value.Sum.Party(domain.Party unwrap alice)),
), ),
tExercise()(ShRecord(echo = "bob")), tExercise()(ShRecord(echo = "bob")),
Expand All @@ -348,7 +344,7 @@ abstract class HttpServiceIntegrationTest
.parseResponse[JsValue] .parseResponse[JsValue]
} yield inside(exerciseTest) { } yield inside(exerciseTest) {
case domain.ErrorResponse(Seq(lookup), None, StatusCodes.BadRequest, _) => case domain.ErrorResponse(Seq(lookup), None, StatusCodes.BadRequest, _) =>
lookup should include regex raw"Cannot resolve template ID, given: TemplateId\(None,IIou,IIou\)" lookup should include regex raw"Cannot resolve template ID, given: TemplateId\([a-z0-9]+,IIou,IIou\)"
} }
} }


Expand Down Expand Up @@ -383,7 +379,7 @@ object HttpServiceIntegrationTest {
private val echoTextSample: echoTextVA.Inj = ShRecord(echo = "Bob") private val echoTextSample: echoTextVA.Inj = ShRecord(echo = "Bob")


private def tExercise( private def tExercise(
choiceInterfaceId: Option[domain.ContractTypeId.Interface.OptionalPkg] = None, choiceInterfaceId: Option[domain.ContractTypeId.Interface.RequiredPkg] = None,
choiceName: String = "Transfer", choiceName: String = "Transfer",
choiceArgType: VA = echoTextVA, choiceArgType: VA = echoTextVA,
)( )(
Expand All @@ -392,7 +388,7 @@ object HttpServiceIntegrationTest {
TExercise(choiceInterfaceId, choiceName, choiceArgType, choiceArg) TExercise(choiceInterfaceId, choiceName, choiceArgType, choiceArg)


private final case class TExercise[Inj]( private final case class TExercise[Inj](
choiceInterfaceId: Option[domain.ContractTypeId.Interface.OptionalPkg], choiceInterfaceId: Option[domain.ContractTypeId.Interface.RequiredPkg],
choiceName: String, choiceName: String,
choiceArgType: VA.Aux[Inj], choiceArgType: VA.Aux[Inj],
choiceArg: Inj, choiceArg: Inj,
Expand Down
4 changes: 3 additions & 1 deletion sdk/ledger-service/http-json/src/it/scala/http/HttpServiceWithPostgresIntTest.scala
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ abstract class HttpServiceWithPostgresIntTest
val searchDataSet = genSearchDataSet(party) val searchDataSet = genSearchDataSet(party)
searchExpectOk( searchExpectOk(
searchDataSet, searchDataSet,
jsObject("""{"templateIds": ["Iou:Iou"], "query": {"currency": "EUR"}}"""), jsObject(
s"""{"templateIds": ["${TpId.Iou.Iou.fqn}"], "query": {"currency": "EUR"}}"""
),
fixture, fixture,
headers, headers,
).flatMap { searchResult => ).flatMap { searchResult =>
Expand Down
2 changes: 1 addition & 1 deletion sdk/ledger-service/http-json/src/it/scala/http/WebSocketCloseTest.scala
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class WebSocketCloseTest
.subprotocols(subprotocols.head, subprotocols.tail: _*) .subprotocols(subprotocols.head, subprotocols.tail: _*)
.buildAsync(wsUri, listener) .buildAsync(wsUri, listener)
.asScala .asScala
_ <- ws.sendText("""{"templateIds": ["Iou:Iou"]}""", true).asScala _ <- ws.sendText(s"""{"templateIds": ["${TpId.Iou.Iou.fqn}"]}""", true).asScala
_ <- ws.sendClose(WebSocket.NORMAL_CLOSURE, "ok").asScala _ <- ws.sendClose(WebSocket.NORMAL_CLOSURE, "ok").asScala
_ <- serverCloseReceived.future _ <- serverCloseReceived.future
} yield { } yield {
Expand Down