From a3cf85e77851a8aa79835ddda0c51ef45f98dea8 Mon Sep 17 00:00:00 2001
From: Andras Slemmer <andras.slemmer@r3cev.com>
Date: Mon, 1 Aug 2016 14:13:38 +0100
Subject: [PATCH] core: Use toBase58String/toPublicKey in Kryo
---
.../kotlin/com/r3corda/core/crypto/CryptoUtilities.kt | 2 +-
.../main/kotlin/com/r3corda/core/serialization/Kryo.kt | 9 +--------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/core/src/main/kotlin/com/r3corda/core/crypto/CryptoUtilities.kt b/core/src/main/kotlin/com/r3corda/core/crypto/CryptoUtilities.kt
index 255ff8ef71..e45016ad5a 100644
--- a/core/src/main/kotlin/com/r3corda/core/crypto/CryptoUtilities.kt
+++ b/core/src/main/kotlin/com/r3corda/core/crypto/CryptoUtilities.kt
@@ -148,7 +148,7 @@ fun PrivateKey.signWithECDSA(bitsToSign: ByteArray, publicKey: PublicKey): Digit
val ed25519Curve = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512)
-fun String.toPublicKey(): PublicKey = EdDSAPublicKey(EdDSAPublicKeySpec(Base58.decode(this), ed25519Curve))
+fun String.toPublicKey() = EdDSAPublicKey(EdDSAPublicKeySpec(Base58.decode(this), ed25519Curve))
fun PublicKey.toBase58String() = Base58.encode((this as EdDSAPublicKey).abyte)
fun KeyPair.signWithECDSA(bitsToSign: ByteArray) = private.signWithECDSA(bitsToSign, public)
diff --git a/core/src/main/kotlin/com/r3corda/core/serialization/Kryo.kt b/core/src/main/kotlin/com/r3corda/core/serialization/Kryo.kt
index 851f26ade1..a4dc221acf 100644
--- a/core/src/main/kotlin/com/r3corda/core/serialization/Kryo.kt
+++ b/core/src/main/kotlin/com/r3corda/core/serialization/Kryo.kt
@@ -10,10 +10,7 @@ import com.esotericsoftware.kryo.io.Input
import com.esotericsoftware.kryo.io.Output
import com.esotericsoftware.kryo.serializers.JavaSerializer
import com.r3corda.core.contracts.*
-import com.r3corda.core.crypto.Party
-import com.r3corda.core.crypto.SecureHash
-import com.r3corda.core.crypto.generateKeyPair
-import com.r3corda.core.crypto.sha256
+import com.r3corda.core.crypto.*
import com.r3corda.core.node.AttachmentsClassLoader
import com.r3corda.core.node.services.AttachmentStorage
import com.r3corda.core.utilities.NonEmptySet
@@ -275,8 +272,6 @@ object WireTransactionSerializer : Serializer<WireTransaction>() {
/** For serialising an ed25519 private key */
@ThreadSafe
object Ed25519PrivateKeySerializer : Serializer<EdDSAPrivateKey>() {
- val ed25519Curve = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512)
-
override fun write(kryo: Kryo, output: Output, obj: EdDSAPrivateKey) {
check(obj.params == ed25519Curve)
output.writeBytesWithLength(obj.seed)
@@ -291,8 +286,6 @@ object Ed25519PrivateKeySerializer : Serializer<EdDSAPrivateKey>() {
/** For serialising an ed25519 public key */
@ThreadSafe
object Ed25519PublicKeySerializer : Serializer<EdDSAPublicKey>() {
- val ed25519Curve = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512)
-
override fun write(kryo: Kryo, output: Output, obj: EdDSAPublicKey) {
check(obj.params == ed25519Curve)
output.writeBytesWithLength(obj.abyte)