From 4bea11029b06023e64db19e59ea40947aa433283 Mon Sep 17 00:00:00 2001 From: Yiftach Kaplan Date: Thu, 18 Apr 2024 14:15:13 +0100 Subject: [PATCH 1/2] CORE-20347: Add link ack in --- .../src/main/java/net/corda/schema/Schemas.java | 1 + .../src/main/resources/net/corda/schema/P2P.yaml | 7 +++++++ gradle.properties | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/data/topic-schema/src/main/java/net/corda/schema/Schemas.java b/data/topic-schema/src/main/java/net/corda/schema/Schemas.java index d5935f136..e1e39e583 100644 --- a/data/topic-schema/src/main/java/net/corda/schema/Schemas.java +++ b/data/topic-schema/src/main/java/net/corda/schema/Schemas.java @@ -188,6 +188,7 @@ private P2P() { public static final String P2P_MGM_ALLOWED_CLIENT_CERTIFICATE_SUBJECTS = "p2p.mgm.allowed.client.certificate.subjects"; public static final String LINK_OUT_TOPIC = "link.out"; public static final String LINK_IN_TOPIC = "link.in"; + public static final String LINK_ACK_IN_TOPIC = "link.ack.in"; public static final String GATEWAY_TLS_TRUSTSTORES = "gateway.tls.truststores"; public static final String GATEWAY_TLS_CERTIFICATES = "gateway.tls.certs"; public static final String GATEWAY_REVOCATION_CHECK_REQUEST_TOPIC = "gateway.revocation.request"; diff --git a/data/topic-schema/src/main/resources/net/corda/schema/P2P.yaml b/data/topic-schema/src/main/resources/net/corda/schema/P2P.yaml index d83bea713..f11471971 100644 --- a/data/topic-schema/src/main/resources/net/corda/schema/P2P.yaml +++ b/data/topic-schema/src/main/resources/net/corda/schema/P2P.yaml @@ -114,6 +114,13 @@ topics: producers: - gateway config: + LinkAckInTopic: + name: link.ack.in + consumers: + - link-manager + producers: + - link-manager + config: LinkOutTopic: name: link.out consumers: diff --git a/gradle.properties b/gradle.properties index 295536c73..5245816a8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ cordaProductVersion = 5.3.0 # NOTE: update this each time this module contains a breaking change ## NOTE: currently this is a top level revision, so all API versions will line up, but this could be moved to ## a per module property in which case module versions can change independently. -cordaApiRevision = 10 +cordaApiRevision = 210 # Main kotlin.stdlib.default.dependency = false From 08034219b1301e850dac3224a31e5fb9d32adc16 Mon Sep 17 00:00:00 2001 From: Yiftach Kaplan Date: Mon, 22 Apr 2024 16:38:04 +0100 Subject: [PATCH 2/2] Remove maxCacheSizeMegabytes --- .../p2p.linkManager/1.0/corda.p2p.linkManager.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json b/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json index ee5cf18c2..d9d456ed9 100644 --- a/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json +++ b/data/config-schema/src/main/resources/net/corda/schema/configuration/p2p.linkManager/1.0/corda.p2p.linkManager.json @@ -171,12 +171,6 @@ "type": "object", "default": {}, "properties": { - "maxCacheSizeMegabytes": { - "description": "The maximum allowed size of the data message cache in megabytes.", - "type": "integer", - "default": 100, - "minimum": 1 - }, "maxCacheOffsetAge": { "description": "The oldest offset of a cached data message, relative to the last sent message offset (in number of records).", "type": "integer",