fix tests

XRPLF · May 3, 2023 · 792c934 · 792c934
1 parent b88ea29
commit 792c934
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 22 deletions.
diff --git a/tests/integration/transactions/test_xchain_account_create_commit.py b/tests/integration/transactions/test_xchain_account_create_commit.py
@@ -1,5 +1,8 @@
 from tests.integration.integration_test_case import IntegrationTestCase
-from tests.integration.it_utils import submit_transaction_async, test_async_and_sync
+from tests.integration.it_utils import (
+ sign_and_reliable_submission_async,
+ test_async_and_sync,
+)
 from tests.integration.reusable_values import BRIDGE, WALLET
 from xrpl.models import AccountInfo, XChainAccountCreateCommit
 from xrpl.wallet import Wallet
@@ -13,7 +16,7 @@ async def test_basic_functionality(self, client):
  initial_balance = int(account_info1.result["account_data"]["Balance"])
  amount = int(BRIDGE.min_account_create_amount)
 
- response = await submit_transaction_async(
+ response = await sign_and_reliable_submission_async(
  XChainAccountCreateCommit(
  account=WALLET.classic_address,
  xchain_bridge=BRIDGE.xchain_bridge,
@@ -22,6 +25,7 @@ async def test_basic_functionality(self, client):
  destination=Wallet.create().classic_address,
  ),
  WALLET,
+ client,
  )
  self.assertTrue(response.is_successful())
  self.assertEqual(response.result["engine_result"], "tesSUCCESS")

diff --git a/tests/integration/transactions/test_xchain_add_account_create_attestation.py b/tests/integration/transactions/test_xchain_add_account_create_attestation.py
@@ -1,7 +1,7 @@
 from tests.integration.integration_test_case import IntegrationTestCase
 from tests.integration.it_utils import (
  LEDGER_ACCEPT_REQUEST,
- submit_transaction_async,
+ sign_and_reliable_submission_async,
  test_async_and_sync,
 )
 from tests.integration.reusable_values import BRIDGE, WITNESS_WALLET
@@ -48,7 +48,7 @@ async def test_basic_functionality(self, client):
  WITNESS_WALLET.private_key,
  )
 
- response = await submit_transaction_async(
+ response = await sign_and_reliable_submission_async(
  XChainAddAccountCreateAttestation.from_xrpl(
  {
  "Account": WITNESS_WALLET.classic_address,

diff --git a/tests/integration/transactions/test_xchain_add_claim_attestation.py b/tests/integration/transactions/test_xchain_add_claim_attestation.py
@@ -1,7 +1,7 @@
 from tests.integration.integration_test_case import IntegrationTestCase
 from tests.integration.it_utils import (
  LEDGER_ACCEPT_REQUEST,
- submit_transaction_async,
+ sign_and_reliable_submission_async,
  test_async_and_sync,
 )
 from tests.integration.reusable_values import BRIDGE, DESTINATION, WITNESS_WALLET
@@ -16,7 +16,7 @@ class TestXChainAddClaimAttestation(IntegrationTestCase):
  @test_async_and_sync(globals())
  async def test_basic_functionality(self, client):
  other_chain_source = Wallet.create().classic_address
- claim_id_response = await submit_transaction_async(
+ claim_id_response = await sign_and_reliable_submission_async(
  XChainCreateClaimID(
  account=DESTINATION.classic_address,
  xchain_bridge=BRIDGE.xchain_bridge,
@@ -65,7 +65,7 @@ async def test_basic_functionality(self, client):
  WITNESS_WALLET.private_key,
  )
 
- response = await submit_transaction_async(
+ response = await sign_and_reliable_submission_async(
  XChainAddClaimAttestation.from_xrpl(
  {
  "Account": WITNESS_WALLET.classic_address,
@@ -86,4 +86,6 @@ async def test_basic_functionality(self, client):
  AccountInfo(account=DESTINATION.classic_address)
  )
  final_balance = int(account_info2.result["account_data"]["Balance"])
- self.assertEqual(final_balance, initial_balance + int(amount))
+ self.assertEqual(
+ final_balance, initial_balance + int(amount) - int(BRIDGE.signature_reward)
+ )
diff --git a/tests/integration/transactions/test_xchain_claim.py b/tests/integration/transactions/test_xchain_claim.py
@@ -1,7 +1,7 @@
 from tests.integration.integration_test_case import IntegrationTestCase
 from tests.integration.it_utils import (
  LEDGER_ACCEPT_REQUEST,
- submit_transaction_async,
+ sign_and_reliable_submission_async,
  test_async_and_sync,
 )
 from tests.integration.reusable_values import BRIDGE, DESTINATION, WITNESS_WALLET
@@ -22,7 +22,7 @@ class TestXChainClaim(IntegrationTestCase):
  @test_async_and_sync(globals())
  async def test_basic_functionality(self, client):
  other_chain_source = Wallet.create().classic_address
- claim_id_response = await submit_transaction_async(
+ claim_id_response = await sign_and_reliable_submission_async(
  XChainCreateClaimID(
  account=DESTINATION.classic_address,
  xchain_bridge=BRIDGE.xchain_bridge,
@@ -70,7 +70,7 @@ async def test_basic_functionality(self, client):
  WITNESS_WALLET.private_key,
  )
 
- response = await submit_transaction_async(
+ response = await sign_and_reliable_submission_async(
  XChainAddClaimAttestation.from_xrpl(
  {
  "Account": WITNESS_WALLET.classic_address,
@@ -93,7 +93,7 @@ async def test_basic_functionality(self, client):
  intermediate_balance = int(account_info2.result["account_data"]["Balance"])
  self.assertEqual(intermediate_balance, initial_balance)
 
- response = await submit_transaction_async(
+ response = await sign_and_reliable_submission_async(
  XChainClaim(
  account=DESTINATION.classic_address,
  xchain_bridge=BRIDGE.xchain_bridge,
@@ -114,5 +114,5 @@ async def test_basic_functionality(self, client):
  final_balance = int(account_info3.result["account_data"]["Balance"])
  self.assertEqual(
  final_balance,
- initial_balance + int(amount) - 10,
+ initial_balance + int(amount) - int(BRIDGE.signature_reward) - 10,
  )
diff --git a/tests/integration/transactions/test_xchain_commit.py b/tests/integration/transactions/test_xchain_commit.py
@@ -1,5 +1,8 @@
 from tests.integration.integration_test_case import IntegrationTestCase
-from tests.integration.it_utils import submit_transaction_async, test_async_and_sync
+from tests.integration.it_utils import (
+ sign_and_reliable_submission_async,
+ test_async_and_sync,
+)
 from tests.integration.reusable_values import BRIDGE, WALLET
 from xrpl.models import AccountInfo, XChainCommit
 
@@ -12,14 +15,15 @@ async def test_basic_functionality(self, client):
  initial_balance = int(account_info1.result["account_data"]["Balance"])
  amount = 1000000
 
- response = await submit_transaction_async(
+ response = await sign_and_reliable_submission_async(
  XChainCommit(
  account=WALLET.classic_address,
  xchain_bridge=BRIDGE.xchain_bridge,
  amount=str(amount),
  xchain_claim_id=1,
  ),
  WALLET,
+ client,
  )
  self.assertTrue(response.is_successful())
  self.assertEqual(response.result["engine_result"], "tesSUCCESS")

diff --git a/tests/integration/transactions/test_xchain_create_bridge.py b/tests/integration/transactions/test_xchain_create_bridge.py
@@ -2,7 +2,7 @@
 from tests.integration.it_utils import (
  MASTER_ACCOUNT,
  fund_wallet_async,
- submit_transaction_async,
+ sign_and_reliable_submission_async,
  test_async_and_sync,
 )
 from xrpl.models import (
@@ -20,7 +20,7 @@ class TestXChainCreateBridge(IntegrationTestCase):
  async def test_basic_functionality(self, client):
  door_wallet = Wallet.create()
  await fund_wallet_async(door_wallet)
- response = await submit_transaction_async(
+ response = await sign_and_reliable_submission_async(
  XChainCreateBridge(
  account=door_wallet.classic_address,
  xchain_bridge=XChainBridge(
@@ -33,6 +33,7 @@ async def test_basic_functionality(self, client):
  min_account_create_amount="10000000",
  ),
  door_wallet,
+ client,
  )
  self.assertTrue(response.is_successful())
  self.assertEqual(response.result["engine_result"], "tesSUCCESS")

diff --git a/tests/integration/transactions/test_xchain_create_claim_id.py b/tests/integration/transactions/test_xchain_create_claim_id.py
@@ -1,7 +1,7 @@
 from tests.integration.integration_test_case import IntegrationTestCase
 from tests.integration.it_utils import (
  fund_wallet_async,
- submit_transaction_async,
+ sign_and_reliable_submission_async,
  test_async_and_sync,
 )
 from tests.integration.reusable_values import BRIDGE
@@ -14,14 +14,15 @@ class TestXChainCreateClaimID(IntegrationTestCase):
  async def test_basic_functionality(self, client):
  account = Wallet.create()
  await fund_wallet_async(account)
- response = await submit_transaction_async(
+ response = await sign_and_reliable_submission_async(
  XChainCreateClaimID(
  account=account.classic_address,
  xchain_bridge=BRIDGE.xchain_bridge,
  other_chain_source=Wallet.create().classic_address,
  signature_reward=BRIDGE.signature_reward,
  ),
  account,
+ client,
  )
  self.assertTrue(response.is_successful())
  self.assertEqual(response.result["engine_result"], "tesSUCCESS")

diff --git a/tests/integration/transactions/test_xchain_modify_bridge.py b/tests/integration/transactions/test_xchain_modify_bridge.py
@@ -2,7 +2,7 @@
 from tests.integration.it_utils import (
  MASTER_ACCOUNT,
  fund_wallet_async,
- submit_transaction_async,
+ sign_and_reliable_submission_async,
  test_async_and_sync,
 )
 from xrpl.models import (
@@ -21,7 +21,7 @@ class TestXChainCreateBridge(IntegrationTestCase):
  async def test_basic_functionality(self, client):
  door_wallet = Wallet.create()
  await fund_wallet_async(door_wallet)
- response = await submit_transaction_async(
+ response = await sign_and_reliable_submission_async(
  XChainCreateBridge(
  account=door_wallet.classic_address,
  xchain_bridge=XChainBridge(
@@ -34,6 +34,7 @@ async def test_basic_functionality(self, client):
  min_account_create_amount="10000000",
  ),
  door_wallet,
+ client,
  )
  self.assertTrue(response.is_successful())
  self.assertEqual(response.result["engine_result"], "tesSUCCESS")
@@ -47,7 +48,7 @@ async def test_basic_functionality(self, client):
  bridge1 = account_objects1.result["account_objects"][0]
  self.assertEqual(bridge1["SignatureReward"], "200")
 
- response = await submit_transaction_async(
+ response = await sign_and_reliable_submission_async(
  XChainModifyBridge(
  account=door_wallet.classic_address,
  xchain_bridge=XChainBridge(