From 6b26d7d1a23029d51560ea4bf437f28255287603 Mon Sep 17 00:00:00 2001
From: Rick Parker <rick.parker@r3.com>
Date: Mon, 21 May 2018 10:01:06 +0100
Subject: [PATCH] ENT-1476 Upgrade enterprise to de-contended EdDSA lib version
 (#843)

---
 build.gradle                                           |  2 +-
 .../net/corda/core/internal/X509EdDSAEngineTest.kt     | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index af66200dd0..d137817193 100644
--- a/build.gradle
+++ b/build.gradle
@@ -72,7 +72,7 @@ buildscript {
     ext.postgresql_version = '42.1.4'
     ext.rxjava_version = '1.2.4'
     ext.dokka_version = '0.9.16-eap-2'
-    ext.eddsa_version = '0.2.0'
+    ext.eddsa_version = '0.3.0' // Performance tuned version for enterprise.
     ext.dependency_checker_version = '3.1.0'
     ext.commons_collections_version = '4.1'
     ext.beanutils_version = '1.9.3'
diff --git a/core/src/test/kotlin/net/corda/core/internal/X509EdDSAEngineTest.kt b/core/src/test/kotlin/net/corda/core/internal/X509EdDSAEngineTest.kt
index 8da6026cc5..29daea501e 100644
--- a/core/src/test/kotlin/net/corda/core/internal/X509EdDSAEngineTest.kt
+++ b/core/src/test/kotlin/net/corda/core/internal/X509EdDSAEngineTest.kt
@@ -103,7 +103,7 @@ class X509EdDSAEngineTest {
     }
 
     /**
-     * Verify that signing with an X509Key wrapped EdDSA key fails when using the underlying EdDSAEngine.
+     * Verify that signing with an X509Key wrapped EdDSA key succeeds when using the underlying EdDSAEngine.
      */
     @Test
     fun `sign and verify with X509Key and old engine fails`() {
@@ -118,11 +118,9 @@ class X509EdDSAEngineTest {
 
         // Now verify the signature
         val signature = engine.sign()
-        assertFailsWith<InvalidKeyException> {
-            engine.initVerify(publicKey)
-            engine.update(randomBytes)
-            engine.verify(signature)
-        }
+        engine.initVerify(publicKey)
+        engine.update(randomBytes)
+        engine.verify(signature)
     }
 
     /** Verify will fail if the input public key cannot be converted to EdDSA public key. */