digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-19 16:57:40 +03:00
Code Issues Projects Releases Wiki Activity

update canton to 20240612.13461.v15c6df12 (#19371)

Browse Source 
* update canton to 20240612.13461.v15c6df12

tell-slack: canton

* TransactionFilter: provide second parameter

Adapting to https://github.com/DACH-NY/canton/pull/19556

---------

Co-authored-by: Azure Pipelines Daml Build <support@digitalasset.com>
Co-authored-by: oliverse-da <oliver.seeliger@digitalasset.com>
This commit is contained in:
azure-pipelines[bot] 2024-06-13 15:04:29 +00:00 committed by GitHub
parent dcd1714d33
commit 24e0f5e81c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdk/canton/community/bindings-java/src/main/java/com/daml/ledger/javaapi/data/TransactionFilter.java
View File

@ -72,12 +72,6 @@ public final class TransactionFilter {
this.anyPartyFilterO = anyPartyFilterO;
}
public TransactionFilter(
@NonNull Map<@NonNull String, @NonNull Filter> partyToFilters) {
this.partyToFilters = partyToFilters;
this.anyPartyFilterO = Optional.empty();
}
public static TransactionFilter transactionFilter(
ContractTypeCompanion<?, ?, ?, ?> contractCompanion, Optional<Set<String>> partiesO) {
Filter filter =

2
sdk/canton/ref
View File

@ -1 +1 @@
20240612.13460.va46dc363
20240612.13461.v15c6df12

9
sdk/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/UpdateClientImplTest.scala
View File

@ -64,7 +64,8 @@ final class UpdateClientImplTest
private val ledgerBegin = data.ParticipantOffset.ParticipantBegin.getInstance()
private val ledgerEnd = data.ParticipantOffset.ParticipantEnd.getInstance()
private val emptyFilter = new TransactionFilter(Map.empty[String, data.Filter].asJava)
private val emptyFilter =
new TransactionFilter(Map.empty[String, data.Filter].asJava, None.toJava)
behavior of "8.1 TransactionClient.getTransactions"
@ -105,7 +106,8 @@ final class UpdateClientImplTest
).asJava,
None.toJava,
)
).asJava
).asJava,
None.toJava,
)
transactionClient
@ -165,7 +167,8 @@ final class UpdateClientImplTest
).asJava,
None.toJava,
)
).asJava
).asJava,
None.toJava,
)
transactionClient

6
sdk/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/helpers/DataLayerHelpers.scala
View File

@ -48,7 +48,8 @@ trait DataLayerHelpers {
.withWorkflowId("workflowId")
}
val filterNothing: TransactionFilter = new TransactionFilter(Map[String, Filter]().asJava)
val filterNothing: TransactionFilter =
new TransactionFilter(Map[String, Filter]().asJava, None.toJava)
def filterFor(party: String): TransactionFilter =
new TransactionFilter(
@ -58,6 +59,7 @@ trait DataLayerHelpers {
Map.empty.asJava,
Some(Filter.Wildcard.HIDE_CREATED_EVENT_BLOB).toJava,
): Filter)
).asJava
).asJava,
None.toJava,
)
}

4
sdk/language-support/java/codegen/src/ledger-tests/scala/com/daml/TestUtil.scala
View File

@ -24,6 +24,7 @@ import java.util.{Optional, UUID}
import scala.concurrent.duration._
import scala.concurrent.{Await, ExecutionContext, ExecutionContextExecutor, Future}
import scala.jdk.CollectionConverters._
import scala.jdk.OptionConverters._
import scala.jdk.javaapi.OptionConverters
import scala.language.implicitConversions
@ -63,7 +64,8 @@ object TestUtil {
private def randomId = UUID.randomUUID().toString
def allTemplates(partyName: String) = new TransactionFilter(
Map[String, Filter](partyName -> NoFilter.instance).asJava
Map[String, Filter](partyName -> NoFilter.instance).asJava,
None.toJava,
)
def sendCmd(channel: Channel, partyName: String, hasCmds: HasCommands*): Empty = {