1. Addressed issue when deriving account transfers.

casper-network · Feb 8, 2021 · ea6a08b · ea6a08b
1 parent 285fa72
commit ea6a08b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/stests/__init__.py b/stests/__init__.py
@@ -7,7 +7,7 @@
 #    ╚═════╝░░░░╚═╝░░░╚══════╝╚═════╝░░░░╚═╝░░░╚═════╝░
 
 __title__ = "stests"
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 __author__ = "Casper Labs AG, Zug, Switzerland"
 __license__ = "CasperLabs Open Source License (COSL)"
 __copyright__ = "Copyright 2020 Casper Labs"
diff --git a/stests/generators/utils/accounts.py b/stests/generators/utils/accounts.py
@@ -73,7 +73,6 @@ def do_transfer(
     # Set amount to transfer (in the case of refunds).
     if amount is None:
         amount = get_account_balance(network, node, cp1) - chain.DEFAULT_TX_FEE
-        print(amount)
 
     # Dispatch tx -> chain.
     dispatch_info = chain.DeployDispatchInfo(cp1, network, node)
@@ -195,14 +194,16 @@ def get_account_range(accounts: int, deploys: int) -> int:
     return range(1, (deploys if accounts == 0 else accounts) + 1)
 
 
-def get_account_transfer_count(accounts: int, account_idx: int, deploys: int) -> int:
+def get_account_deploy_count(accounts: int, account_idx: int, deploys: int) -> int:
     """Returns account index to use for a particular transfer.
     
     """
     if accounts == 0:
         return 1
-
-    return 10
+
+    q, r = divmod(deploys, accounts)
+
+    return q + (1 if account_idx <= r else 0)
 
 
 def get_faucet_initial_balance(transfers, amount) -> int:

diff --git a/stests/generators/wg_100/p2s3_assert_balances.py b/stests/generators/wg_100/p2s3_assert_balances.py
@@ -21,6 +21,6 @@ def execute(ctx: ExecutionContext):
 
     """
     for account_idx in accounts.get_account_range(ctx.args.accounts, ctx.args.transfers):
-        transfers = accounts.get_account_transfer_count(ctx.args.accounts, account_idx, ctx.args.transfers)
-        amount = transfers * (ctx.args.amount + chain.DEFAULT_TX_FEE_NATIVE_TRANSFER)
+        account_transfers = accounts.get_account_deploy_count(ctx.args.accounts, account_idx, ctx.args.transfers)
+        amount = account_transfers * (ctx.args.amount + chain.DEFAULT_TX_FEE_NATIVE_TRANSFER)
         verification.verify_account_balance(ctx, account_idx, amount)
diff --git a/stests/generators/wg_110/p2s3_assert_balances.py b/stests/generators/wg_110/p2s3_assert_balances.py
@@ -21,6 +21,6 @@ def execute(ctx: ExecutionContext):
 
     """
     for account_idx in accounts.get_account_range(ctx.args.accounts, ctx.args.transfers):
-        transfers = accounts.get_account_transfer_count(ctx.args.accounts, account_idx, ctx.args.transfers)
+        transfers = accounts.get_account_deploy_count(ctx.args.accounts, account_idx, ctx.args.transfers)
         amount = transfers * (ctx.args.amount + chain.DEFAULT_TX_FEE_NATIVE_TRANSFER)
         verification.verify_account_balance(ctx, account_idx, amount)