From 8e6c4b3b87bda01dcceb0208d62fe340de5be0a6 Mon Sep 17 00:00:00 2001 From: Adel El-Beik Date: Thu, 17 Oct 2024 14:21:52 +0100 Subject: [PATCH] ENT-11975: Fixed up merge issues. --- .../contracts/ConstraintsPropagationTests.kt | 6 +++--- .../coretests/contracts/RotatedKeysTest.kt | 15 --------------- .../corda/core/internal/TransactionUtils.kt | 18 ------------------ .../node/services/config/NodeConfiguration.kt | 7 ------- .../config/schema/v1/ConfigSections.kt | 8 -------- 5 files changed, 3 insertions(+), 51 deletions(-) diff --git a/core-tests/src/test/kotlin/net/corda/coretests/contracts/ConstraintsPropagationTests.kt b/core-tests/src/test/kotlin/net/corda/coretests/contracts/ConstraintsPropagationTests.kt index 5ea968e7da..1dacd76c47 100644 --- a/core-tests/src/test/kotlin/net/corda/coretests/contracts/ConstraintsPropagationTests.kt +++ b/core-tests/src/test/kotlin/net/corda/coretests/contracts/ConstraintsPropagationTests.kt @@ -1,8 +1,5 @@ package net.corda.coretests.contracts -import com.nhaarman.mockito_kotlin.doReturn -import com.nhaarman.mockito_kotlin.mock -import com.nhaarman.mockito_kotlin.whenever import net.corda.core.contracts.AlwaysAcceptAttachmentConstraint import net.corda.core.contracts.AutomaticPlaceholderConstraint import net.corda.core.contracts.BelongsToContract @@ -53,6 +50,9 @@ import org.junit.BeforeClass import org.junit.Ignore import org.junit.Rule import org.junit.Test +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import java.security.PublicKey import java.util.jar.Attributes import kotlin.test.assertFailsWith diff --git a/core-tests/src/test/kotlin/net/corda/coretests/contracts/RotatedKeysTest.kt b/core-tests/src/test/kotlin/net/corda/coretests/contracts/RotatedKeysTest.kt index 6df2b8ed70..8e0da67b8d 100644 --- a/core-tests/src/test/kotlin/net/corda/coretests/contracts/RotatedKeysTest.kt +++ b/core-tests/src/test/kotlin/net/corda/coretests/contracts/RotatedKeysTest.kt @@ -1,31 +1,16 @@ package net.corda.coretests.contracts -import net.corda.core.contracts.CordaRotatedKeys import net.corda.core.contracts.RotatedKeys import net.corda.core.crypto.CompositeKey import net.corda.core.crypto.sha256 -import net.corda.core.identity.CordaX500Name import net.corda.core.internal.hash -import net.corda.core.internal.retrieveRotatedKeys -import net.corda.core.node.ServiceHub -import net.corda.testing.core.TestIdentity import net.corda.testing.core.internal.JarSignatureTestUtils.generateKey import net.corda.testing.core.internal.SelfCleaningDir -import net.corda.testing.node.MockServices import org.junit.Test -import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertTrue class RotatedKeysTest { - - @Test(timeout = 300_000) - fun validateDefaultRotatedKeysAreRetrievableFromMockServices() { - val services: ServiceHub = MockServices(TestIdentity(CordaX500Name("MegaCorp", "London", "GB"))) - val rotatedKeys = services.retrieveRotatedKeys() - assertEquals( CordaRotatedKeys.keys.rotatedSigningKeys, rotatedKeys.rotatedSigningKeys) - } - @Test(timeout = 300_000) fun `when input and output keys are the same canBeTransitioned returns true`() { SelfCleaningDir().use { file -> diff --git a/core/src/main/kotlin/net/corda/core/internal/TransactionUtils.kt b/core/src/main/kotlin/net/corda/core/internal/TransactionUtils.kt index 83af97891f..d6ed4e254a 100644 --- a/core/src/main/kotlin/net/corda/core/internal/TransactionUtils.kt +++ b/core/src/main/kotlin/net/corda/core/internal/TransactionUtils.kt @@ -28,7 +28,6 @@ import net.corda.core.crypto.algorithm import net.corda.core.crypto.internal.DigestAlgorithmFactory import net.corda.core.flows.FlowLogic import net.corda.core.identity.Party -import net.corda.core.node.ServiceHub import net.corda.core.node.ServicesForResolution import net.corda.core.serialization.MissingAttachmentsException import net.corda.core.serialization.MissingAttachmentsRuntimeException @@ -45,27 +44,10 @@ import net.corda.core.transactions.FullTransaction import net.corda.core.transactions.NotaryChangeWireTransaction import net.corda.core.transactions.SignedTransaction import net.corda.core.utilities.OpaqueBytes -import net.corda.core.utilities.contextLogger import java.io.ByteArrayOutputStream import java.security.PublicKey import kotlin.reflect.KClass - -fun ServiceHub.retrieveRotatedKeys(): RotatedKeys { - if (this is ServiceHubCoreInternal) { - return this.rotatedKeys - } - var clazz: Class<*> = javaClass - while (true) { - if (clazz.name == "net.corda.testing.node.MockServices") { - return clazz.getDeclaredMethod("getRotatedKeys").apply { isAccessible = true }.invoke(this) as RotatedKeys - } - clazz = clazz.superclass ?: return CordaRotatedKeys.keys.also { - this.contextLogger().warn("${javaClass.name} is not a MockServices instance - returning default rotated keys") - } - } -} - /** Constructs a [NotaryChangeWireTransaction]. */ class NotaryChangeTransactionBuilder(val inputs: List, val notary: Party, diff --git a/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt b/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt index 1cec05e1fd..7fa506d885 100644 --- a/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt +++ b/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt @@ -222,13 +222,6 @@ data class FlowTimeoutConfiguration( val backoffBase: Double ) -/** - * Represents a list of rotated CorDapp attachment signing keys. - * - * @param rotatedKeys This is a list of public key hashes (SHA-256) in uppercase hexidecimal, that are all equivalent. - */ -data class RotatedCorDappSignerKeyConfiguration(val rotatedKeys: List) - data class TelemetryConfiguration( val openTelemetryEnabled: Boolean, val simpleLogTelemetryEnabled: Boolean, diff --git a/node/src/main/kotlin/net/corda/node/services/config/schema/v1/ConfigSections.kt b/node/src/main/kotlin/net/corda/node/services/config/schema/v1/ConfigSections.kt index c3039a53c7..a474ebb3d5 100644 --- a/node/src/main/kotlin/net/corda/node/services/config/schema/v1/ConfigSections.kt +++ b/node/src/main/kotlin/net/corda/node/services/config/schema/v1/ConfigSections.kt @@ -214,14 +214,6 @@ internal object FlowTimeoutConfigurationSpec : Configuration.Specification("RotatedCorDappSignerKeyConfiguration") { - private val rotatedKeys by string().listOrEmpty() - override fun parseValid(configuration: Config, options: Configuration.Options): Valid { - val config = configuration.withOptions(options) - return valid(RotatedCorDappSignerKeyConfiguration(config[rotatedKeys])) - } -} - internal object TelemetryConfigurationSpec : Configuration.Specification("TelemetryConfiguration") { private val openTelemetryEnabled by boolean() private val simpleLogTelemetryEnabled by boolean()