Restore original checks

Author: sappenin

xrpl4j-integration-tests/src/test/java/org/xrpl/xrpl4j/tests/EscrowIT.java

@@ -95,6 +95,17 @@ public void createAndFinishTimeBasedEscrow() throws JsonRpcClientErrorException,
       createResult.transactionResult().hash()
     );
 
+    //////////////////////
+    // Then wait until the transaction gets committed to a validated ledger
+    TransactionResult<EscrowCreate> result = this.scanForResult(
+      () -> this.getValidatedTransaction(createResult.transactionResult().hash(), EscrowCreate.class)
+    );
+
+    assertEntryEqualsObjectFromAccountObjects(
+      senderKeyPair.publicKey().deriveAddress(),
+      escrowCreate.sequence()
+    );
+
     //////////////////////
     // Wait until the close time on the current validated ledger is after the finishAfter time on the Escrow
     this.scanForResult(
@@ -108,11 +119,6 @@ public void createAndFinishTimeBasedEscrow() throws JsonRpcClientErrorException,
           )
     );
 
-    assertEntryEqualsObjectFromAccountObjects(
-      senderKeyPair.publicKey().deriveAddress(),
-      escrowCreate.sequence()
-    );
-
     //////////////////////
     // Receiver submits an EscrowFinish transaction to release the Escrow funds
     AccountInfoResult receiverAccountInfo = this.scanForResult(
@@ -195,6 +201,17 @@ public void createAndFinishTimeBasedEscrowToSelf() throws JsonRpcClientErrorExce
       createResult.transactionResult().hash()
     );
 
+    //////////////////////
+    // Then wait until the transaction gets committed to a validated ledger
+    this.scanForResult(
+      () -> this.getValidatedTransaction(createResult.transactionResult().hash(), EscrowCreate.class)
+    );
+
+    assertEntryEqualsObjectFromAccountObjects(
+      senderKeyPair.publicKey().deriveAddress(),
+      escrowCreate.sequence()
+    );
+
     //////////////////////
     // Wait until the close time on the current validated ledger is after the finishAfter time on the Escrow
     this.scanForResult(
@@ -208,11 +225,6 @@ public void createAndFinishTimeBasedEscrowToSelf() throws JsonRpcClientErrorExce
           )
     );
 
-    assertEntryEqualsObjectFromAccountObjects(
-      senderKeyPair.publicKey().deriveAddress(),
-      escrowCreate.sequence()
-    );
-
     //////////////////////
     // Receiver submits an EscrowFinish transaction to release the Escrow funds
     final AccountInfoResult preEscrowFinishSenderAccountInfo = this.scanForResult(
@@ -438,6 +450,17 @@ public void createAndCancelTimeBasedEscrowToSelf() throws JsonRpcClientErrorExce
       createResult.transactionResult().hash()
     );
 
+    //////////////////////
+    // Then wait until the transaction gets committed to a validated ledger
+    TransactionResult<EscrowCreate> result = this.scanForResult(
+      () -> this.getValidatedTransaction(createResult.transactionResult().hash(), EscrowCreate.class)
+    );
+
+    assertEntryEqualsObjectFromAccountObjects(
+      senderKeyPair.publicKey().deriveAddress(),
+      escrowCreate.sequence()
+    );
+
     //////////////////////
     // Wait until the close time on the current validated ledger is after the finishAfter time on the Escrow
     this.scanForResult(
@@ -451,11 +474,6 @@ public void createAndCancelTimeBasedEscrowToSelf() throws JsonRpcClientErrorExce
           )
     );
 
-    assertEntryEqualsObjectFromAccountObjects(
-      senderKeyPair.publicKey().deriveAddress(),
-      escrowCreate.sequence()
-    );
-
     //////////////////////
     // Receiver submits an EscrowFinish transaction to release the Escrow funds
     final AccountInfoResult preEscrowFinishSenderAccountInfo = this.scanForResult(
@@ -539,6 +557,17 @@ public void createAndFinishCryptoConditionBasedEscrow() throws JsonRpcClientErro
       createResult.transactionResult().hash()
     );
 
+    //////////////////////
+    // Then wait until the transaction gets committed to a validated ledger
+    this.scanForResult(
+      () -> this.getValidatedTransaction(createResult.transactionResult().hash(), EscrowCreate.class)
+    );
+
+    assertEntryEqualsObjectFromAccountObjects(
+      senderKeyPair.publicKey().deriveAddress(),
+      escrowCreate.sequence()
+    );
+
     //////////////////////
     // Wait until the close time on the current validated ledger is after the finishAfter time on the Escrow
     this.scanForResult(
@@ -552,11 +581,6 @@ public void createAndFinishCryptoConditionBasedEscrow() throws JsonRpcClientErro
           )
     );
 
-    assertEntryEqualsObjectFromAccountObjects(
-      senderKeyPair.publicKey().deriveAddress(),
-      escrowCreate.sequence()
-    );
-
     //////////////////////
     // Execute the escrow using the secret fulfillment known only to the appropriate party.
     AccountInfoResult receiverAccountInfo = this.scanForResult(