From ac337240a6ede921f46b6979e4a5cbbd870314a5 Mon Sep 17 00:00:00 2001
From: Mike Hearn <mike@r3cev.com>
Date: Wed, 12 Apr 2017 12:00:03 +0200
Subject: [PATCH] Minor: more cleanups

---
 core/src/main/kotlin/net/corda/core/crypto/Crypto.kt        | 2 +-
 .../main/kotlin/net/corda/core/crypto/EdDSAKeyFactory.kt    | 2 +-
 .../test/kotlin/net/corda/core/crypto/CryptoUtilsTest.kt    | 6 ++----
 .../services/persistence/DBTransactionMappingStorage.kt     | 2 +-
 .../node/services/transactions/DistributedImmutableMap.kt   | 2 +-
 .../net/corda/node/services/vault/VaultSoftLockManager.kt   | 2 +-
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/core/src/main/kotlin/net/corda/core/crypto/Crypto.kt b/core/src/main/kotlin/net/corda/core/crypto/Crypto.kt
index d43bb621a0..61901618e2 100644
--- a/core/src/main/kotlin/net/corda/core/crypto/Crypto.kt
+++ b/core/src/main/kotlin/net/corda/core/crypto/Crypto.kt
@@ -74,7 +74,7 @@ object Crypto {
             "EDDSA_ED25519_SHA512",
             "EdDSA",
             EdDSAEngine(),
-            EdDSAKeyFactory(),
+            EdDSAKeyFactory,
             net.i2p.crypto.eddsa.KeyPairGenerator(), // EdDSA engine uses a custom KeyPairGenerator Vs BouncyCastle.
             EdDSANamedCurveTable.getByName("ed25519-sha-512"),
             256,
diff --git a/core/src/main/kotlin/net/corda/core/crypto/EdDSAKeyFactory.kt b/core/src/main/kotlin/net/corda/core/crypto/EdDSAKeyFactory.kt
index 252f7c7f1a..caefb44df2 100644
--- a/core/src/main/kotlin/net/corda/core/crypto/EdDSAKeyFactory.kt
+++ b/core/src/main/kotlin/net/corda/core/crypto/EdDSAKeyFactory.kt
@@ -7,4 +7,4 @@ import java.security.KeyFactory
  * This is required as a [SignatureScheme] requires a [java.security.KeyFactory] property, but i2p has
  * its own KeyFactory for EdDSA, thus this actually a Proxy Pattern over i2p's KeyFactory.
  */
-class EdDSAKeyFactory : KeyFactory(net.i2p.crypto.eddsa.KeyFactory(), null, "EDDSA_ED25519_SHA512")
+object EdDSAKeyFactory : KeyFactory(net.i2p.crypto.eddsa.KeyFactory(), null, "EDDSA_ED25519_SHA512")
diff --git a/core/src/test/kotlin/net/corda/core/crypto/CryptoUtilsTest.kt b/core/src/test/kotlin/net/corda/core/crypto/CryptoUtilsTest.kt
index d95e17be1d..60e1717451 100644
--- a/core/src/test/kotlin/net/corda/core/crypto/CryptoUtilsTest.kt
+++ b/core/src/test/kotlin/net/corda/core/crypto/CryptoUtilsTest.kt
@@ -424,14 +424,12 @@ class CryptoUtilsTest {
         val privKey: EdDSAPrivateKey = keyPair.private as EdDSAPrivateKey
         val pubKey: EdDSAPublicKey = keyPair.public as EdDSAPublicKey
 
-        val kf = EdDSAKeyFactory()
-
         // Encode and decode private key.
-        val privKey2 = kf.generatePrivate(PKCS8EncodedKeySpec(privKey.encoded))
+        val privKey2 = EdDSAKeyFactory.generatePrivate(PKCS8EncodedKeySpec(privKey.encoded))
         assertEquals(privKey2, privKey)
 
         // Encode and decode public key.
-        val pubKey2 = kf.generatePublic(X509EncodedKeySpec(pubKey.encoded))
+        val pubKey2 = EdDSAKeyFactory.generatePublic(X509EncodedKeySpec(pubKey.encoded))
         assertEquals(pubKey2, pubKey)
     }
 
diff --git a/node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt b/node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt
index 32d6c7f10c..69cdf43e5c 100644
--- a/node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt
+++ b/node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt
@@ -44,7 +44,7 @@ class DBTransactionMappingStorage : StateMachineRecordedTransactionMappingStorag
 
     private class InnerState {
         val stateMachineTransactionMap = TransactionMappingsMap()
-        val updates = PublishSubject.create<StateMachineTransactionMapping>()!!
+        val updates: PublishSubject<StateMachineTransactionMapping> = PublishSubject.create()
     }
     private val mutex = ThreadBox(InnerState())
 
diff --git a/node/src/main/kotlin/net/corda/node/services/transactions/DistributedImmutableMap.kt b/node/src/main/kotlin/net/corda/node/services/transactions/DistributedImmutableMap.kt
index 5ac90125f6..7c09b7fdd3 100644
--- a/node/src/main/kotlin/net/corda/node/services/transactions/DistributedImmutableMap.kt
+++ b/node/src/main/kotlin/net/corda/node/services/transactions/DistributedImmutableMap.kt
@@ -44,7 +44,7 @@ class DistributedImmutableMap<K : Any, V : Any>(val db: Database, tableName: Str
     /** Gets a value for the given [Commands.Get.key] */
     fun get(commit: Commit<Commands.Get<K, V>>): V? {
         commit.use {
-            val key = commit.operation().key
+            val key = it.operation().key
             return databaseTransaction(db) { map[key] }
         }
     }
diff --git a/node/src/main/kotlin/net/corda/node/services/vault/VaultSoftLockManager.kt b/node/src/main/kotlin/net/corda/node/services/vault/VaultSoftLockManager.kt
index b1e7582d34..b65c62819e 100644
--- a/node/src/main/kotlin/net/corda/node/services/vault/VaultSoftLockManager.kt
+++ b/node/src/main/kotlin/net/corda/node/services/vault/VaultSoftLockManager.kt
@@ -20,7 +20,7 @@ class VaultSoftLockManager(val vault: VaultService, smm: StateMachineManager) {
 
     init {
         smm.changes.subscribe { (logic, addOrRemove, id) ->
-            if (addOrRemove == AddOrRemove.REMOVE && trackingFlowIds.contains(id.uuid)) {
+            if (addOrRemove == AddOrRemove.REMOVE && id.uuid in trackingFlowIds) {
                 log.trace { "$addOrRemove Flow name ${logic.javaClass} with id $id" }
                 unregisterSoftLocks(id, logic)
             }