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

Converted sealed data types to be data classes

Browse Source
This commit is contained in:
Shams Asari
2017-03-31 14:42:24 +01:00
parent da92806b99
commit faef877a8d
28 changed files with 108 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt
View File

@ -513,7 +513,7 @@ sealed class CertificateChainCheckPolicy {
}
}
class MustContainOneOf(val trustedAliases: Set<String>) : CertificateChainCheckPolicy() {
data class MustContainOneOf(val trustedAliases: Set<String>) : CertificateChainCheckPolicy() {
override fun createCheck(keyStore: KeyStore, trustStore: KeyStore): Check {
val trustedPublicKeys = trustedAliases.map { trustStore.getCertificate(it).publicKey }.toSet()
return object : Check {

1
node/src/main/kotlin/net/corda/node/services/statemachine/FlowIORequest.kt
View File

@ -2,7 +2,6 @@ package net.corda.node.services.statemachine
import net.corda.core.crypto.SecureHash
// TODO revisit when Kotlin 1.1 is released and data classes can extend other classes
interface FlowIORequest {
// This is used to identify where we suspended, in case of message mismatch errors and other things where we
// don't have the original stack trace because it's in a suspended fiber.

6
node/src/main/kotlin/net/corda/node/services/statemachine/FlowSession.kt
View File

@ -32,13 +32,11 @@ sealed class FlowSessionState {
abstract val sendToParty: Party
/** [otherParty] may be a specific peer or a service party */
class Initiating(val otherParty: Party) : FlowSessionState() {
data class Initiating(val otherParty: Party) : FlowSessionState() {
override val sendToParty: Party get() = otherParty
override fun toString(): String = "${javaClass.simpleName}($otherParty)"
}
class Initiated(val peerParty: Party, val peerSessionId: Long) : FlowSessionState() {
data class Initiated(val peerParty: Party, val peerSessionId: Long) : FlowSessionState() {
override val sendToParty: Party get() = peerParty
override fun toString(): String = "${javaClass.simpleName}($peerParty, $peerSessionId)"
}
}

10
node/src/main/kotlin/net/corda/node/services/transactions/BFTSMaRt.kt
View File

@ -51,15 +51,15 @@ object BFTSMaRt {
/** Sent from [Server] to [Client]. */
@CordaSerializable
sealed class ReplicaResponse {
class Error(val error: NotaryError) : ReplicaResponse()
class Signature(val txSignature: DigitalSignature) : ReplicaResponse()
data class Error(val error: NotaryError) : ReplicaResponse()
data class Signature(val txSignature: DigitalSignature) : ReplicaResponse()
}
/** An aggregate response from all replica ([Server]) replies sent from [Client] back to the calling application. */
@CordaSerializable
sealed class ClusterResponse {
class Error(val error: NotaryError) : ClusterResponse()
class Signatures(val txSignatures: List<DigitalSignature>) : ClusterResponse()
data class Error(val error: NotaryError) : ClusterResponse()
data class Signatures(val txSignatures: List<DigitalSignature>) : ClusterResponse()
}
class Client(val id: Int) : SingletonSerializeAsToken() {
@ -193,7 +193,7 @@ object BFTSMaRt {
protected fun validateTimestamp(t: Timestamp?) {
if (t != null && !timestampChecker.isValid(t))
throw NotaryException(NotaryError.TimestampInvalid())
throw NotaryException(NotaryError.TimestampInvalid)
}
protected fun sign(bytes: ByteArray): DigitalSignature.WithKey {

11
node/src/test/kotlin/net/corda/node/services/AbstractNetworkMapServiceTest.kt
View File

@ -252,16 +252,11 @@ abstract class AbstractNetworkMapServiceTest<out S : AbstractNetworkMapService>
return network.createNode(legalName = legalName, nodeFactory = NoNMSNodeFactory)
}
sealed class Changed(val node: NodeInfo) {
override fun equals(other: Any?): Boolean = other?.javaClass == this.javaClass && (other as Changed).node == this.node
override fun hashCode(): Int = node.hashCode()
override fun toString(): String = "${javaClass.simpleName}($node)"
class Added(node: NodeInfo) : Changed(node) {
sealed class Changed {
data class Added(val node: NodeInfo) : Changed() {
constructor(node: MockNode) : this(node.info)
}
class Removed(node: NodeInfo) : Changed(node) {
data class Removed(val node: NodeInfo) : Changed() {
constructor(node: MockNode) : this(node.info)
}
}

2
node/src/test/kotlin/net/corda/node/services/database/RequeryConfigurationTest.kt
View File

@ -164,7 +164,7 @@ class RequeryConfigurationTest {
commands = emptyList(),
notary = DUMMY_NOTARY,
signers = emptyList(),
type = TransactionType.General(),
type = TransactionType.General,
timestamp = null
)
return SignedTransaction(wtx.serialized, listOf(DigitalSignature.WithKey(NullPublicKey, ByteArray(1))))

2
node/src/test/kotlin/net/corda/node/services/persistence/DBTransactionStorageTests.kt
View File

@ -153,7 +153,7 @@ class DBTransactionStorageTests {
commands = emptyList(),
notary = DUMMY_NOTARY,
signers = emptyList(),
type = TransactionType.General(),
type = TransactionType.General,
timestamp = null
)
return SignedTransaction(wtx.serialized, listOf(DigitalSignature.WithKey(NullPublicKey, ByteArray(1))))