From 06c8b880a3c8c263eb09b88c277a184d0b5a2396 Mon Sep 17 00:00:00 2001
From: Katarzyna Streich <katarzyna.streich@r3cev.com>
Date: Fri, 28 Apr 2017 11:27:29 +0100
Subject: [PATCH] Rename leavesKeys to leafKeys.

---
 core/src/main/kotlin/net/corda/core/crypto/CompositeKey.kt | 2 +-
 core/src/main/kotlin/net/corda/core/crypto/CryptoUtils.kt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/kotlin/net/corda/core/crypto/CompositeKey.kt b/core/src/main/kotlin/net/corda/core/crypto/CompositeKey.kt
index 69382b3605..eb571f8278 100644
--- a/core/src/main/kotlin/net/corda/core/crypto/CompositeKey.kt
+++ b/core/src/main/kotlin/net/corda/core/crypto/CompositeKey.kt
@@ -80,7 +80,7 @@ class CompositeKey private constructor (val threshold: Int,
     /**
      * Set of all leaf keys of that CompositeKey.
      */
-    val leavesKeys: Set<PublicKey>
+    val leafKeys: Set<PublicKey>
         get() = children.flatMap { it.node.keys }.toSet() // Uses PublicKey.keys extension.
 
     override fun equals(other: Any?): Boolean {
diff --git a/core/src/main/kotlin/net/corda/core/crypto/CryptoUtils.kt b/core/src/main/kotlin/net/corda/core/crypto/CryptoUtils.kt
index d2aee4fa2c..2eda3b3420 100644
--- a/core/src/main/kotlin/net/corda/core/crypto/CryptoUtils.kt
+++ b/core/src/main/kotlin/net/corda/core/crypto/CryptoUtils.kt
@@ -118,7 +118,7 @@ fun PublicKey.toStringShort(): String {
 }
 
 val PublicKey.keys: Set<PublicKey> get() {
-    return if (this is CompositeKey) this.leavesKeys
+    return if (this is CompositeKey) this.leafKeys
     else setOf(this)
 }