@@ -113,7 +113,6 @@ public void createAndFinishTimeBasedEscrow() throws JsonRpcClientErrorException,
113113 escrowCreate .sequence ()
114114 );
115115
116-
117116 //////////////////////
118117 // Receiver submits an EscrowFinish transaction to release the Escrow funds
119118 AccountInfoResult receiverAccountInfo = this .scanForResult (
@@ -198,17 +197,6 @@ public void createAndFinishTimeBasedEscrowToSelf() throws JsonRpcClientErrorExce
198197 createResult .transactionResult ().hash ()
199198 );
200199
201- //////////////////////
202- // Then wait until the transaction gets committed to a validated ledger
203- TransactionResult <EscrowCreate > result = this .scanForResult (
204- () -> this .getValidatedTransaction (createResult .transactionResult ().hash (), EscrowCreate .class )
205- );
206-
207- assertEntryEqualsObjectFromAccountObjects (
208- senderKeyPair .publicKey ().deriveAddress (),
209- escrowCreate .sequence ()
210- );
211-
212200 //////////////////////
213201 // Wait until the close time on the current validated ledger is after the finishAfter time on the Escrow
214202 this .scanForResult (
@@ -221,6 +209,10 @@ public void createAndFinishTimeBasedEscrowToSelf() throws JsonRpcClientErrorExce
221209 .orElse (UnsignedLong .MAX_VALUE )
222210 )
223211 );
212+ assertEntryEqualsObjectFromAccountObjects (
213+ senderKeyPair .publicKey ().deriveAddress (),
214+ escrowCreate .sequence ()
215+ );
224216
225217 final AccountInfoResult postEscrowCreateSenderAccountInfo = this .scanForResult (
226218 () -> this .getValidatedAccountInfo (senderKeyPair .publicKey ().deriveAddress ())
@@ -238,7 +230,7 @@ public void createAndFinishTimeBasedEscrowToSelf() throws JsonRpcClientErrorExce
238230 .fee (feeResult .drops ().openLedgerFee ())
239231 .sequence (preEscrowFinishSenderAccountInfo .accountData ().sequence ())
240232 .owner (senderKeyPair .publicKey ().deriveAddress ())
241- .offerSequence (result .transaction ().sequence ())
233+ .offerSequence (createResult . transactionResult () .transaction ().sequence ())
242234 .signingPublicKey (senderKeyPair .publicKey ())
243235 .build ();
244236
@@ -456,17 +448,6 @@ public void createAndCancelTimeBasedEscrowToSelf() throws JsonRpcClientErrorExce
456448 createResult .transactionResult ().hash ()
457449 );
458450
459- //////////////////////
460- // Then wait until the transaction gets committed to a validated ledger
461- TransactionResult <EscrowCreate > result = this .scanForResult (
462- () -> this .getValidatedTransaction (createResult .transactionResult ().hash (), EscrowCreate .class )
463- );
464-
465- assertEntryEqualsObjectFromAccountObjects (
466- senderKeyPair .publicKey ().deriveAddress (),
467- escrowCreate .sequence ()
468- );
469-
470451 //////////////////////
471452 // Wait until the close time on the current validated ledger is after the finishAfter time on the Escrow
472453 this .scanForResult (
@@ -480,6 +461,11 @@ public void createAndCancelTimeBasedEscrowToSelf() throws JsonRpcClientErrorExce
480461 )
481462 );
482463
464+ assertEntryEqualsObjectFromAccountObjects (
465+ senderKeyPair .publicKey ().deriveAddress (),
466+ escrowCreate .sequence ()
467+ );
468+
483469 final AccountInfoResult postEscrowCreateSenderAccountInfo = this .scanForResult (
484470 () -> this .getValidatedAccountInfo (senderKeyPair .publicKey ().deriveAddress ())
485471 );
@@ -496,7 +482,7 @@ public void createAndCancelTimeBasedEscrowToSelf() throws JsonRpcClientErrorExce
496482 .fee (feeResult .drops ().openLedgerFee ())
497483 .sequence (preEscrowFinishSenderAccountInfo .accountData ().sequence ())
498484 .owner (senderKeyPair .publicKey ().deriveAddress ())
499- .offerSequence (result .transaction ().sequence ())
485+ .offerSequence (createResult . transactionResult () .transaction ().sequence ())
500486 .signingPublicKey (senderKeyPair .publicKey ())
501487 .build ();
502488
0 commit comments