fix integration tests

Signed-off-by: Nischal Sharma <[email protected]>
hyperledger-web3j · Mar 21, 2024 · 1c39643 · 1c39643
1 parent c34a8cb
commit 1c39643
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/...ion-tests/src/test/java/org/web3j/protocol/besu/BesuPrivacyQuickstartIntegrationTest.java b/...ion-tests/src/test/java/org/web3j/protocol/besu/BesuPrivacyQuickstartIntegrationTest.java
@@ -27,6 +27,7 @@
 import org.web3j.crypto.TransactionEncoder;
 import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
 import org.web3j.protocol.besu.response.privacy.PrivateTransactionWithPrivacyGroup;
+import org.web3j.protocol.core.methods.response.EthSendTransaction;
 import org.web3j.protocol.eea.crypto.PrivateTransactionEncoder;
 import org.web3j.protocol.eea.crypto.RawPrivateTransaction;
 import org.web3j.protocol.http.HttpService;
@@ -86,7 +87,7 @@ public static void setUpOnce() throws InterruptedException, IOException {
 
         int blockNumber = 0;
         do {
-            TimeUnit.MINUTES.sleep(1);
+            TimeUnit.SECONDS.sleep(30);
             blockNumber = rpcNode.ethBlockNumber().send().getBlockNumber().intValue();
         } while (blockNumber <= 100);
     }
@@ -113,14 +114,11 @@ public void testConnection() throws IOException {
     public void simplePrivateTransactions() throws Exception {
 
         // Build new privacy group using the create API
-        final Base64String privacyGroupId =
-                nodeBob.privCreatePrivacyGroup(
-                                Arrays.asList(
-                                        ENCLAVE_KEY_ALICE, ENCLAVE_KEY_BOB, ENCLAVE_KEY_CHARLIE),
-                                "AliceBobCharlie",
-                                "AliceBobCharlie group")
-                        .send()
-                        .getPrivacyGroupId();
+        Base64String privacyGroupId;
+        do {
+            privacyGroupId = getPrivacyGroupId();
+            TimeUnit.SECONDS.sleep(30);
+        } while (privacyGroupId == null);
 
         final BigInteger nonce =
                 nodeCharlie
@@ -142,9 +140,13 @@ public void simplePrivateTransactions() throws Exception {
                         PrivateTransactionEncoder.signMessage(
                                 rawPrivateTransaction, CHAIN_ID, ALICE));
 
-        final String transactionHash =
-                nodeAlice.eeaSendRawTransaction(signedTransactionData).send().getTransactionHash();
+        EthSendTransaction eeaTransaction;
+        do {
+            eeaTransaction = nodeAlice.eeaSendRawTransaction(signedTransactionData).send();
+            TimeUnit.SECONDS.sleep(30);
+        } while (eeaTransaction.hasError());
 
+        final String transactionHash = eeaTransaction.getTransactionHash();
         final PollingPrivateTransactionReceiptProcessor receiptProcessor =
                 new PollingPrivateTransactionReceiptProcessor(nodeAlice, 1 * 1000, 120);
         final PrivateTransactionReceipt receipt =
@@ -304,6 +306,15 @@ public void privacyGroupContract() throws Exception {
         testBalances(tokenAlice, tokenBob, BigInteger.ZERO, BigInteger.TEN);
     }
 
+    public Base64String getPrivacyGroupId() throws IOException {
+        return nodeBob.privCreatePrivacyGroup(
+                        Arrays.asList(ENCLAVE_KEY_ALICE, ENCLAVE_KEY_BOB, ENCLAVE_KEY_CHARLIE),
+                        "AliceBobCharlie",
+                        "AliceBobCharlie group")
+                .send()
+                .getPrivacyGroupId();
+    }
+
     private void testBalances(
             final HumanStandardToken tokenAlice,
             final HumanStandardToken tokenBob,

diff --git a/integration-tests/src/test/resources/quorum-test-network/.env b/integration-tests/src/test/resources/quorum-test-network/.env
@@ -1,7 +1,7 @@
 # This file defines environment variables defaults for Docker-compose
 # but we also use it for shell scripts as a sourced file
 
-BESU_VERSION=23.7.2
+BESU_VERSION=23.10.3
 QUORUM_VERSION=23.4.0
 TESSERA_VERSION=23.4.0
 ETHSIGNER_VERSION=22.1.3