Use web3j for mandatory for and privacy flags

pom.xml

@@ -43,7 +43,7 @@
  <env>run-local</env> <!-- Gauge environment being used -->
 
  <!-- dependencies -->
- <web3j-quorum.version>4.8.4</web3j-quorum.version>
+ <web3j-quorum.version>4.8.9-SNAPSHOT</web3j-quorum.version>
  <web3j.version>4.8.7</web3j.version>
  <commons-lang.version>2.6</commons-lang.version>
  <docker-java.version>3.2.2</docker-java.version>

src/main/java/com/quorum/gauge/TestSummaryMain.java

@@ -34,7 +34,9 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Read JUNIT xml report produced by Gauge and provide a summary like Gauge does.
@@ -54,7 +56,7 @@ public static void main(String[] args) throws Exception {
  System.err.println("Missing args");
  System.exit(1);
  }
- String jobId = args[0];
+ String jobId = args[0].strip();
  File xmlFile = new File(args[1]);
  File outputDir = xmlFile.getParentFile();
  if (args.length > 2) {

src/main/java/com/quorum/gauge/services/AbstractService.java

@@ -21,7 +21,6 @@
 
 import com.quorum.gauge.common.Context;
 import com.quorum.gauge.common.QuorumNetworkProperty;
-import com.quorum.gauge.ext.PrivateClientTransactionManager;
 import com.quorum.gauge.ext.PublicClientTransactionManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.web3j.crypto.Credentials;
@@ -90,7 +89,7 @@ public void setPermContractDepGasProvider(ContractGasProvider permContractDepGas
  }
 
  public ClientTransactionManager clientTransactionManager(Web3j web3j, String fromAddress, String privateFrom, List<String> privateFor) {
- return new PrivateClientTransactionManager((Quorum) web3j, fromAddress, privateFrom, privateFor);
+ return new ClientTransactionManager((Quorum) web3j, fromAddress, privateFrom, privateFor);
  }
 
  public org.web3j.tx.ClientTransactionManager vanillaClientTransactionManager(Web3j web3j, String fromAddress, long chainId) {
@@ -108,6 +107,6 @@ public TransactionManager quorumTransactionManager(Quorum web3j,
  Enclave enclave) {
 
 
- return new QuorumTransactionManager(web3j, credentials, privateFrom, privateFor, enclave);
+ return new QuorumTransactionManager(web3j, enclave, credentials, privateFrom, privateFor);
  }
 }

src/main/java/com/quorum/gauge/services/AccumulatorService.java

@@ -19,9 +19,8 @@
 
 package com.quorum.gauge.services;
 
-import com.quorum.gauge.common.PrivacyFlag;
+
 import com.quorum.gauge.common.QuorumNetworkProperty;
-import com.quorum.gauge.ext.PrivateClientTransactionManager;
 import com.quorum.gauge.sol.Accumulator;
 import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
@@ -31,7 +30,9 @@
 import org.springframework.stereotype.Service;
 import org.web3j.protocol.core.DefaultBlockParameterName;
 import org.web3j.protocol.core.methods.response.TransactionReceipt;
+import org.web3j.quorum.PrivacyFlag;
 import org.web3j.quorum.Quorum;
+import org.web3j.quorum.tx.ClientTransactionManager;
 import org.web3j.tx.ReadonlyTransactionManager;
 import org.web3j.tx.exceptions.ContractCallException;
 
@@ -68,7 +69,7 @@ public Observable<? extends Accumulator> createAccumulatorPublicContract(QuorumN
  });
  }
 
- public Observable<? extends Accumulator> createAccumulatorPrivateContract(QuorumNetworkProperty.Node source, List<QuorumNetworkProperty.Node> targets, BigInteger gas, int initVal, List<PrivacyFlag> flags) {
+ public Observable<? extends Accumulator> createAccumulatorPrivateContract(QuorumNetworkProperty.Node source, List<QuorumNetworkProperty.Node> targets, BigInteger gas, int initVal, PrivacyFlag flags) {
  Quorum client = connectionFactory().getConnection(source);
  final List<String> privateFor;
  if (null != targets) {
@@ -78,7 +79,7 @@ public Observable<? extends Accumulator> createAccumulatorPrivateContract(Quorum
  }
 
  return accountService.getDefaultAccountAddress(source).flatMap(address -> {
- PrivateClientTransactionManager clientTransactionManager = new PrivateClientTransactionManager(
+ ClientTransactionManager clientTransactionManager = new ClientTransactionManager(
  client,
  address,
  null,
@@ -98,13 +99,13 @@ public Observable<TransactionReceipt> incAccumulatorPrivate(final QuorumNetworkP
  final String contractAddress,
  final BigInteger gasLimit,
  final int increment,
- final List<PrivacyFlag> flags) {
+ final PrivacyFlag flags) {
  final Quorum client = connectionFactory().getConnection(source);
  final BigInteger value = BigInteger.valueOf(increment);
  final List<String> privateFor = target.stream().map(q -> privacyService.id(q)).collect(Collectors.toList());
 
  return accountService.getDefaultAccountAddress(source).flatMap(acctAddress -> {
- PrivateClientTransactionManager txManager = new PrivateClientTransactionManager(
+ ClientTransactionManager txManager = new ClientTransactionManager(
  client, acctAddress, null, privateFor, flags, DEFAULT_MAX_RETRY, DEFAULT_SLEEP_DURATION_IN_MILLIS
  );
  Accumulator accumulator = Accumulator.load(

src/main/java/com/quorum/gauge/services/ContractCodeReaderService.java

@@ -19,9 +19,8 @@
 
 package com.quorum.gauge.services;
 
-import com.quorum.gauge.common.PrivacyFlag;
+
 import com.quorum.gauge.common.QuorumNetworkProperty;
-import com.quorum.gauge.ext.PrivateClientTransactionManager;
 import com.quorum.gauge.sol.ContractCodeReader;
 import io.reactivex.Observable;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +39,9 @@
 import org.web3j.protocol.core.methods.request.Transaction;
 import org.web3j.protocol.core.methods.response.EthCall;
 import org.web3j.protocol.core.methods.response.TransactionReceipt;
+import org.web3j.quorum.PrivacyFlag;
 import org.web3j.quorum.Quorum;
+import org.web3j.quorum.tx.ClientTransactionManager;
 import org.web3j.tx.Contract;
 import org.web3j.tx.exceptions.ContractCallException;
 
@@ -67,12 +68,12 @@ public Observable<? extends Contract> createPrivateContract(QuorumNetworkPropert
  Quorum client = connectionFactory().getConnection(source);
 
  return accountService.getAccountAddress(source, ethAccountAlias).flatMap(eoa -> {
- PrivateClientTransactionManager clientTransactionManager = new PrivateClientTransactionManager(
+ ClientTransactionManager clientTransactionManager = new ClientTransactionManager(
  client,
  eoa,
  privacyService.id(privateFromAlias),
  privateForAliases.stream().map(privacyService::id).collect(Collectors.toList()),
- List.of(PrivacyFlag.StandardPrivate)
+ PrivacyFlag.STANDARD_PRIVATE
  );
  return ContractCodeReader.deploy(client, clientTransactionManager, getPermContractDepGasProvider()).flowable().toObservable();
  });
@@ -82,12 +83,12 @@ public Observable<TransactionReceipt> setLastCodeSize(QuorumNetworkProperty.Node
  Quorum client = connectionFactory().getConnection(source);
 
  return accountService.getAccountAddress(source, ethAccountAlias)
- .map(eoa -> new PrivateClientTransactionManager(
+ .map(eoa -> new ClientTransactionManager(
  client,
  eoa,
  privacyService.id(privateFromAlias),
  privateForAliases.stream().map(privacyService::id).collect(Collectors.toList()),
- List.of(PrivacyFlag.StandardPrivate)
+ PrivacyFlag.STANDARD_PRIVATE
  ))
  .flatMap(txManager -> ContractCodeReader.load(
  contractAddress, client, txManager, BigInteger.ZERO, DEFAULT_GAS_LIMIT).setLastCodeSize(targetContractAddress)