ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-14 13:18:18 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Delete unused DuplicateContractClassException (#5284)

Browse Source
This commit is contained in:
Dan Newton
2019-07-10 17:01:38 +01:00
committed by Shams Asari
parent 9ccd654ffa
commit 9bcaecfbe3
6 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/source/api-contract-constraints.rst
View File

@ -121,14 +121,10 @@ This is expanded upon in :ref:`contract_constraints_in_transactions`.
.. note:: Signature Constraints are used by default except when a new transaction contains an input state with a Hash Constraint. In this .. note:: Signature Constraints are used by default except when a new transaction contains an input state with a Hash Constraint. In this
situation the Hash Constraint is used. situation the Hash Constraint is used.
.. _app_versioning_with_signature_constraints:
App versioning with Signature Constraints App versioning with Signature Constraints
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Signed apps require a version number to be provided, see :doc:`versioning`. You can't import two different Signed apps require a version number to be provided, see :doc:`versioning`.
JARs that claim to be the same version, provide the same contract classes and which are both signed. At runtime
the node will throw a ``DuplicateContractClassException`` exception if this condition is violated.
Hash Constraints Hash Constraints
---------------- ----------------

2
docs/source/app-upgrade-notes.rst
View File

@ -106,7 +106,7 @@ properly for future releases.
future not hold true. You should know the platform version of the node releases you want to target. future not hold true. You should know the platform version of the node releases you want to target.
The new ``versionId`` number is a version code for **your** app, and is unrelated to Corda's own versions. The new ``versionId`` number is a version code for **your** app, and is unrelated to Corda's own versions.
It is used to informative purposes only. See ":ref:`app_versioning_with_signature_constraints`" for more information. It is currently used for informative purposes only.
**Split your app into contract and workflow JARs.** The duplication between ``contract`` and ``workflow`` blocks exists because you should split your app into **Split your app into contract and workflow JARs.** The duplication between ``contract`` and ``workflow`` blocks exists because you should split your app into
two separate JARs/modules, one that contains on-ledger validation code like states and contracts, and one two separate JARs/modules, one that contains on-ledger validation code like states and contracts, and one

3
docs/source/versioning.rst
View File

@ -98,7 +98,6 @@ It's entirely expected and reasonable to have an open source contracts module an
sophisticated or proprietary business logic, machine learning models, even user interface code. There's nothing that restricts it to just sophisticated or proprietary business logic, machine learning models, even user interface code. There's nothing that restricts it to just
being Corda flows or services. being Corda flows or services.
.. important:: The ``versionId`` specified for the JAR manifest is checked by the platform and is used for informative purposes only. .. important:: The ``versionId`` specified for the JAR manifest is currently used for informative purposes only.
See ":ref:`app_versioning_with_signature_constraints`" for more information.
.. note:: You can read the original design doc here: :doc:`design/targetversion/design`. .. note:: You can read the original design doc here: :doc:`design/targetversion/design`.

6
node-api/src/main/kotlin/net/corda/nodeapi/exceptions/RpcExceptions.kt
View File

@ -11,12 +11,6 @@ import net.corda.core.serialization.CordaSerializable
*/ */
class DuplicateAttachmentException(attachmentHash: String) : java.nio.file.FileAlreadyExistsException(attachmentHash), ClientRelevantError class DuplicateAttachmentException(attachmentHash: String) : java.nio.file.FileAlreadyExistsException(attachmentHash), ClientRelevantError
/**
* Thrown to indicate that a contract class name of the same version was already uploaded to a Corda node.
*/
class DuplicateContractClassException(contractClassName: String, version: Int, attachmentHashes: List<String>) :
Exception("Contract $contractClassName version '$version' already present in the attachments $attachmentHashes"), ClientRelevantError
/** /**
* Thrown to indicate that a flow was not designed for RPC and should be started from an RPC client. * Thrown to indicate that a flow was not designed for RPC and should be started from an RPC client.
*/ */

1
node/src/main/kotlin/net/corda/node/services/persistence/NodeAttachmentService.kt
View File

@ -29,7 +29,6 @@ import net.corda.node.utilities.InfrequentlyMutatedCache
import net.corda.node.utilities.NonInvalidatingCache import net.corda.node.utilities.NonInvalidatingCache
import net.corda.node.utilities.NonInvalidatingWeightBasedCache import net.corda.node.utilities.NonInvalidatingWeightBasedCache
import net.corda.nodeapi.exceptions.DuplicateAttachmentException import net.corda.nodeapi.exceptions.DuplicateAttachmentException
import net.corda.nodeapi.exceptions.DuplicateContractClassException
import net.corda.nodeapi.internal.persistence.CordaPersistence import net.corda.nodeapi.internal.persistence.CordaPersistence
import net.corda.nodeapi.internal.persistence.NODE_DATABASE_PREFIX import net.corda.nodeapi.internal.persistence.NODE_DATABASE_PREFIX
import net.corda.nodeapi.internal.persistence.currentDBSession import net.corda.nodeapi.internal.persistence.currentDBSession

7
node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentServiceTest.kt
View File

@ -21,7 +21,6 @@ import net.corda.core.node.services.vault.Sort
import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.getOrThrow
import net.corda.node.services.transactions.PersistentUniquenessProvider import net.corda.node.services.transactions.PersistentUniquenessProvider
import net.corda.nodeapi.exceptions.DuplicateAttachmentException import net.corda.nodeapi.exceptions.DuplicateAttachmentException
import net.corda.nodeapi.exceptions.DuplicateContractClassException
import net.corda.nodeapi.internal.persistence.CordaPersistence import net.corda.nodeapi.internal.persistence.CordaPersistence
import net.corda.nodeapi.internal.persistence.DatabaseConfig import net.corda.nodeapi.internal.persistence.DatabaseConfig
import net.corda.testing.common.internal.testNetworkParameters import net.corda.testing.common.internal.testNetworkParameters
@ -384,7 +383,7 @@ class NodeAttachmentServiceTest {
} }
@Test @Test
fun `can promote to trusted uploder the same jar if other trusted uplodaer `() { fun `can promote to trusted uploader the same jar if other trusted uploader `() {
SelfCleaningDir().use { file -> SelfCleaningDir().use { file ->
val (contractJar, _) = makeTestSignedContractJar(file.path, "com.example.MyContract") val (contractJar, _) = makeTestSignedContractJar(file.path, "com.example.MyContract")
val anotherContractJar = makeTestContractJar(file.path, listOf( "com.example.MyContract", "com.example.AnotherContract"), true, generateManifest = false, jarFileName = "another-sample.jar") val anotherContractJar = makeTestContractJar(file.path, listOf( "com.example.MyContract", "com.example.AnotherContract"), true, generateManifest = false, jarFileName = "another-sample.jar")
@ -410,7 +409,7 @@ class NodeAttachmentServiceTest {
} }
@Test @Test
fun `can import duplicated contract class and version from unsiged attachment if a signed attachment already exists`() { fun `can import duplicated contract class and version from unsigned attachment if a signed attachment already exists`() {
SelfCleaningDir().use { file -> SelfCleaningDir().use { file ->
val (contractJar, _) = makeTestSignedContractJar(file.path, "com.example.MyContract") val (contractJar, _) = makeTestSignedContractJar(file.path, "com.example.MyContract")
val anotherContractJar = makeTestContractJar(file.path, listOf( "com.example.MyContract", "com.example.AnotherContract"), generateManifest = false, jarFileName = "another-sample.jar") val anotherContractJar = makeTestContractJar(file.path, listOf( "com.example.MyContract", "com.example.AnotherContract"), generateManifest = false, jarFileName = "another-sample.jar")
@ -428,7 +427,7 @@ class NodeAttachmentServiceTest {
} }
@Test @Test
fun `can import duplicated contract class and version from siged attachment if an unsigned attachment already exists`() { fun `can import duplicated contract class and version from signed attachment if an unsigned attachment already exists`() {
SelfCleaningDir().use { file -> SelfCleaningDir().use { file ->
val contractJar = makeTestContractJar(file.path, "com.example.MyContract") val contractJar = makeTestContractJar(file.path, "com.example.MyContract")
val anotherContractJar = makeTestContractJar(file.path, listOf( "com.example.MyContract", "com.example.AnotherContract"), true, generateManifest = false, jarFileName = "another-sample.jar") val anotherContractJar = makeTestContractJar(file.path, listOf( "com.example.MyContract", "com.example.AnotherContract"), true, generateManifest = false, jarFileName = "another-sample.jar")