Fix default privateFrom behaviour

PegaSysEng · Jul 26, 2019 · b6b6857 · b6b6857
1 parent 9336302
commit b6b6857
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eea/PrivateTransactionBuilder.java b/...tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eea/PrivateTransactionBuilder.java
@@ -21,6 +21,7 @@
 import tech.pegasys.pantheon.util.bytes.BytesValue;
 
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -69,7 +70,7 @@ public static class Builder {
     Address to;
     BytesValue privateFrom;
     Optional<BytesValue> privacyGroupId = Optional.empty();
-    Optional<List<BytesValue>> privateFor = Optional.empty();
+    Optional<List<BytesValue>> privateFor = Optional.of(new ArrayList<>());
     SECP256K1.KeyPair keyPair;
 
     public Builder nonce(final long nonce) {
@@ -136,11 +137,10 @@ public String build(final TransactionType type) {
               .privateFrom(privateFrom)
               .restriction(Restriction.RESTRICTED);
 
-      if (privateFor.isPresent()) {
-        builder = builder.privateFor(privateFor.get());
-      }
       if (privacyGroupId.isPresent()) {
         builder = builder.privacyGroupId(privacyGroupId.get());
+      } else {
+        builder = builder.privateFor(privateFor.get());
       }
 
       return RLP.encode(builder.signAndBuild(keyPair)::writeTo).toString();