Skip to content

Commit

Permalink
Upgrade canton to a more recent version (#10944)
Browse files Browse the repository at this point in the history 
changelog_begin
changelog_end
  • Loading branch information
@oliverse-da
oliverse-da authored Sep 20, 2021
1 parent b8533d5 commit 054c6ab
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 26 deletions.
4 changes: 2 additions & 2 deletions deps.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ java_import(
jars = glob(["lib/**/*.jar"]),
)
""",
sha256 = "f4fd0b75c9351b12c562d271ae652fc4bb9262e16c716a02871bf7f4a3e5a05b",
sha256 = "24a7f8ef120878dba9d89d27563618bef104cf79c2278edf1401e5f28e4e24f4",
strip_prefix = "canton-community-0.28.0-SNAPSHOT",
urls = ["https://www.canton.io/releases/canton-community-20210819.tar.gz"],
urls = ["https://www.canton.io/releases/canton-community-20210919.tar.gz"],
)
37 changes: 25 additions & 12 deletions ledger/ledger-api-test-tool-on-canton/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,29 +76,37 @@ conformance_test(
test_tool_args = [
"--verbose",
"--concurrent-test-runs=1", # lowered from default #procs to reduce flakes - details in https://github.com/digital-asset/daml/issues/7316
# The following three contract key tests require uniqueness
"--exclude=ContractKeysIT:CKFetchOrLookup,ContractKeysIT:CKNoFetchUndisclosed,ContractKeysIT:CKMaintainerScoped" +
"--timeout-scale-factor=2", # increased to reduce flakes particularly wrt timeouts in TransactionService*IT tests
"--exclude=ConfigManagementServiceIT,LedgerConfigurationServiceIT" + # dynamic config management not supported by Canton
",ParticipantPruningIT" + # see "conformance-test-participant-pruning" below
",ConfigManagementServiceIT,LedgerConfigurationServiceIT" + # dynamic config management not supported by Canton
",ClosedWorldIT" + # Canton currently fails this test with a different error (missing namespace in "unallocated" party id)
# Excluding tests that require contract key uniqueness and RWArchiveVsFailedLookupByKey (finding a lookup failure after contract creation)
",RaceConditionIT:WWDoubleNonTransientCreate,RaceConditionIT:WWArchiveVsNonTransientCreate,RaceConditionIT:RWTransientCreateVsNonTransientCreate,RaceConditionIT:RWArchiveVsFailedLookupByKey" +
",RaceConditionIT:RWArchiveVsLookupByKey,RaceConditionIT:RWArchiveVsNonConsumingChoice,RaceConditionIT:RWArchiveVsFetch,RaceConditionIT:WWDoubleArchive" +
# The following three contract key tests require uniqueness
",ContractKeysIT:CKFetchOrLookup,ContractKeysIT:CKNoFetchUndisclosed,ContractKeysIT:CKMaintainerScoped" +
",ExceptionsIT,ExceptionRaceConditionIT" + # need UCK mode - added below
",DeeplyNestedValueIT" + # FIXME: Too deeply nested values flake with a time out (half of the time)
",CommandServiceIT:CSReturnStackTrace" + # FIXME: Ensure canton returns stack trace
",CommandServiceIT:CSsubmitAndWaitForTransactionIdInvalidLedgerId,CommandServiceIT:CSsubmitAndWaitForTransactionInvalidLedgerId,CommandServiceIT:CSsubmitAndWaitForTransactionTreeInvalidLedgerId" + # FIXME: return definite_answer in gRPC errors
",CommandSubmissionCompletionIT:CSCRefuseBadChoice,CommandSubmissionCompletionIT:CSCSubmitWithInvalidLedgerId,CommandSubmissionCompletionIT:CSCDisallowEmptyTransactionsSubmission", # FIXME: return definite_answer in gRPC errors
",CommandDeduplicationIT:ParticipantCommandDeduplicationSimpleDeduplicationBasic,CommandDeduplicationIT:ParticipantCommandDeduplicationDeduplicateSubmitterBasic" + # sync vs async error (part of canton #6301)
# Also exclude "optional tests" - which are run separately below
",AppendOnlyCompletionDeduplicationInfoITCommandService" +
",AppendOnlyCompletionDeduplicationInfoITCommandSubmissionService" +
",AppendOnlyCommandDeduplicationParallelIT" +
",ContractIdIT" +
",MultiPartySubmissionIT" +
",ParticipantPruningIT" +
",KVCommandDeduplicationIT", # only for KV-utils
],
) if not is_windows else None

conformance_test(
name = "conformance-test-contract-keys",
name = "conformance-test-contract-keys-and-exceptions",
extra_data = [
":bootstrap.canton",
":canton_deploy.jar",
":canton.conf",
":unique-contract-keys.conf", # needed to pass all contract keys conformance tests
":unique-contract-keys.conf", # needed to pass all contract keys and some exceptions conformance tests
":logback-debug.xml",
"@coreutils_nix//:bin/base64",
"@curl_nix//:bin/curl",
Expand Down Expand Up @@ -129,7 +137,7 @@ conformance_test(
) if not is_windows else None

conformance_test(
name = "conformance-test-contract-ids",
name = "conformance-test-optional",
extra_data = [
":bootstrap.canton",
":canton_deploy.jar",
Expand All @@ -151,11 +159,15 @@ conformance_test(
server = ":canton-test-runner-with-dependencies",
test_tool_args = [
"--verbose",
"--include=ContractIdIT:RejectV0,ContractIdIT:RejectNonSuffixedV1Cid,ContractIdIT:AcceptSuffixedV1Cid",
"--include=ContractIdIT:RejectV0,ContractIdIT:RejectNonSuffixedV1Cid,ContractIdIT:AcceptSuffixedV1Cid" +
",MultiPartySubmissionIT" +
# ",AppendOnlyCommandDeduplicationParallelIT" + # FIXME: Deduplication test not yet passing on canton - canton-#6301
",AppendOnlyCompletionDeduplicationInfoITCommandService,AppendOnlyCompletionDeduplicationInfoITCommandSubmissionService",
"--exclude=MultiPartySubmissionIT:MPSLookupOtherByKeyInvisible" + # Enable once error parsing more permissive
",MultiPartySubmissionIT:MPSCreateInsufficientAuthorization" + # canton returns INTERNAL instead of INVALID_ARGUMENT
",ContractIdIT:AcceptSuffixedV1CidExerciseTarget", # Racy with: ABORTED: CONTRACT_NOT_FOUND(14,0): Contract could not be found with id
],
# TODO https://github.com/digital-asset/daml/issues/10504
# replace `False` by `not is_windows` once canton rejects non suffix CIDs
) if False else None
) if not is_windows else None

conformance_test(
name = "conformance-test-participant-pruning",
Expand Down Expand Up @@ -189,6 +201,7 @@ conformance_test(
test_tool_args = [
"--verbose",
"--concurrent-test-runs=1", # lowered from default #procs to reduce flakes - details in https://github.com/digital-asset/daml/issues/7316
"--timeout-scale-factor=4", # increased to match setting in canton repo
"--include=ParticipantPruningIT",
],
) if not is_windows else None
12 changes: 0 additions & 12 deletions ledger/ledger-api-test-tool-on-canton/enable-faster-pruning.conf
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
canton.domains.test_domain.domain-parameters.reconciliation-interval = 2s
canton.domains.test_domain.domain-parameters.participant-response-timeout = 2s
canton.domains.test_domain.domain-parameters.mediator-reaction-timeout = 2s
canton.participants.participant_1.ledger-api.enable-append-only-schema = true
canton.participants.participant_1.ledger-api.enable-mutable-contract-state-cache = true
canton.participants.participant_1.ledger-api.enable-in-memory-fan-out-for-ledger-api = true
canton.participants.participant_2.ledger-api.enable-append-only-schema = true
canton.participants.participant_2.ledger-api.enable-mutable-contract-state-cache = true
canton.participants.participant_2.ledger-api.enable-in-memory-fan-out-for-ledger-api = true
canton.participants.participant_3.ledger-api.enable-append-only-schema = true
canton.participants.participant_3.ledger-api.enable-mutable-contract-state-cache = true
canton.participants.participant_3.ledger-api.enable-in-memory-fan-out-for-ledger-api = true
canton.participants.participant_4.ledger-api.enable-append-only-schema = true
canton.participants.participant_4.ledger-api.enable-mutable-contract-state-cache = true
canton.participants.participant_4.ledger-api.enable-in-memory-fan-out-for-ledger-api = true

0 comments on commit 054c6ab

Please sign in to comment.