From 5d61d1c8fcc65e012cbae277b5e32292bb7cb600 Mon Sep 17 00:00:00 2001
From: Ivaylo Kirilov <iikirilov@gmail.com>
Date: Thu, 11 Jul 2019 09:16:31 +0100
Subject: [PATCH] Fix acceptance tests

---
 ...ptanceTest.java => EnclaveErrorAcceptanceTest.java} | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/{PrivateTxEnclaveErrorAcceptanceTest.java => EnclaveErrorAcceptanceTest.java} (91%)

diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/PrivateTxEnclaveErrorAcceptanceTest.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java
similarity index 91%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/PrivateTxEnclaveErrorAcceptanceTest.java
rename to acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java
index f07621770b..470a6b4094 100644
--- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/PrivateTxEnclaveErrorAcceptanceTest.java
+++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java
@@ -12,7 +12,6 @@
  */
 package tech.pegasys.pantheon.tests.web3j.privacy;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 import static tech.pegasys.pantheon.tests.web3j.privacy.PrivacyGroup.generatePrivacyGroup;
@@ -23,6 +22,7 @@
 import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eea.PrivateTransactionBuilder;
 import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eea.PrivateTransactionBuilder.TransactionType;
 import tech.pegasys.pantheon.util.bytes.BytesValue;
+import tech.pegasys.pantheon.util.bytes.BytesValues;
 
 import java.util.Base64;
 
@@ -32,7 +32,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-public class PrivateTxEnclaveErrorAcceptanceTest extends PrivacyAcceptanceTestBase {
+public class EnclaveErrorAcceptanceTest extends PrivacyAcceptanceTestBase {
   protected static final String CONTRACT_NAME = "Event Emitter";
 
   private EventEmitterHarness eventEmitterHarness;
@@ -54,7 +54,8 @@ public void setUp() throws Exception {
             privateTransactionVerifier,
             eea);
     wrongPublicKey =
-        BytesValue.wrap(Base64.getEncoder().encode(Box.KeyPair.random().publicKey().bytesArray()));
+        BytesValues.fromBase64(
+            Base64.getEncoder().encode(Box.KeyPair.random().publicKey().bytesArray()));
   }
 
   @Test
@@ -91,8 +92,7 @@ public void enclaveNoPeerUrlError() {
             .nonce(privacyNet.getNode("Alice").nextNonce(privacyGroup))
             .from(privacyNet.getNode("Alice").getAddress())
             .privateFrom(
-                BytesValue.wrap(
-                    privacyNet.getEnclave("Alice").getPublicKeys().get(0).getBytes(UTF_8)))
+                BytesValues.fromBase64(privacyNet.getEnclave("Alice").getPublicKeys().get(0)))
             .privateFor(Lists.newArrayList(wrongPublicKey))
             .keyPair(privacyNet.getNode("Alice").keyPair())
             .build(TransactionType.CREATE_CONTRACT);