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

ENT-3489: Removing unnecessary @CordaSerializable annotation from exceptions (#5209)

Browse Source
This commit is contained in:
Shams Asari 2019-06-11 11:51:30 +01:00 committed by GitHub
parent dfdcf2e00a
commit d685c2154b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/compiler.xml generated
View File

@ -193,8 +193,8 @@
<module name="network-visualiser_test" target="1.8" /> <module name="network-visualiser_test" target="1.8" />
<module name="node-api_main" target="1.8" /> <module name="node-api_main" target="1.8" />
<module name="node-api_test" target="1.8" /> <module name="node-api_test" target="1.8" />
<module name="node-capsule_main" target="1.6" /> <module name="node-capsule_main" target="1.8" />
<module name="node-capsule_test" target="1.6" /> <module name="node-capsule_test" target="1.8" />
<module name="node-driver_integrationTest" target="1.8" /> <module name="node-driver_integrationTest" target="1.8" />
<module name="node-driver_main" target="1.8" /> <module name="node-driver_main" target="1.8" />
<module name="node-driver_test" target="1.8" /> <module name="node-driver_test" target="1.8" />

4
core/src/main/kotlin/net/corda/core/contracts/TransactionVerificationException.kt
View File

@ -266,7 +266,6 @@ abstract class TransactionVerificationException(val txId: SecureHash, message: S
/** /**
* Thrown when multiple attachments provide the same file when building the AttachmentsClassloader for a transaction. * Thrown when multiple attachments provide the same file when building the AttachmentsClassloader for a transaction.
*/ */
@CordaSerializable
@KeepForDJVM @KeepForDJVM
class OverlappingAttachmentsException(txId: SecureHash, val path: String) : TransactionVerificationException(txId, "Multiple attachments define a file at $path.", null) class OverlappingAttachmentsException(txId: SecureHash, val path: String) : TransactionVerificationException(txId, "Multiple attachments define a file at $path.", null)
@ -275,20 +274,17 @@ abstract class TransactionVerificationException(val txId: SecureHash, message: S
* the [txId] will always be [SecureHash.zeroHash] because package ownership is an error with a particular attachment, * the [txId] will always be [SecureHash.zeroHash] because package ownership is an error with a particular attachment,
* and because attachment classloaders are reused this is independent of any particular transaction. * and because attachment classloaders are reused this is independent of any particular transaction.
*/ */
@CordaSerializable
class PackageOwnershipException(txId: SecureHash, @Suppress("unused") val attachmentHash: AttachmentId, @Suppress("unused") val invalidClassName: String, val packageName: String) : TransactionVerificationException(txId, class PackageOwnershipException(txId: SecureHash, @Suppress("unused") val attachmentHash: AttachmentId, @Suppress("unused") val invalidClassName: String, val packageName: String) : TransactionVerificationException(txId,
"""The attachment JAR: $attachmentHash containing the class: $invalidClassName is not signed by the owner of package $packageName specified in the network parameters. """The attachment JAR: $attachmentHash containing the class: $invalidClassName is not signed by the owner of package $packageName specified in the network parameters.
Please check the source of this attachment and if it is malicious contact your zone operator to report this incident. Please check the source of this attachment and if it is malicious contact your zone operator to report this incident.
For details see: https://docs.corda.net/network-map.html#network-parameters""".trimIndent(), null) For details see: https://docs.corda.net/network-map.html#network-parameters""".trimIndent(), null)
@CordaSerializable
class InvalidAttachmentException(txId: SecureHash, @Suppress("unused") val attachmentHash: AttachmentId) : TransactionVerificationException(txId, class InvalidAttachmentException(txId: SecureHash, @Suppress("unused") val attachmentHash: AttachmentId) : TransactionVerificationException(txId,
"The attachment $attachmentHash is not a valid ZIP or JAR file.".trimIndent(), null) "The attachment $attachmentHash is not a valid ZIP or JAR file.".trimIndent(), null)
// TODO: Make this descend from TransactionVerificationException so that untrusted attachments cause flows to be hospitalized. // TODO: Make this descend from TransactionVerificationException so that untrusted attachments cause flows to be hospitalized.
/** Thrown during classloading upon encountering an untrusted attachment (eg. not in the [TRUSTED_UPLOADERS] list) */ /** Thrown during classloading upon encountering an untrusted attachment (eg. not in the [TRUSTED_UPLOADERS] list) */
@KeepForDJVM @KeepForDJVM
@CordaSerializable
class UntrustedAttachmentsException(val txId: SecureHash, val ids: List<SecureHash>) : class UntrustedAttachmentsException(val txId: SecureHash, val ids: List<SecureHash>) :
CordaException("Attempting to load untrusted transaction attachments: $ids. " + CordaException("Attempting to load untrusted transaction attachments: $ids. " +
"At this time these are not loadable because the DJVM sandbox has not yet been integrated. " + "At this time these are not loadable because the DJVM sandbox has not yet been integrated. " +