Update deployer class property to be more descriptive - "number_of_deployment_transactions"

nucypher/blockchain/eth/actors.py

@@ -284,11 +284,11 @@ class DeployerActor(NucypherTokenActor):
         gas_limit = None  # TODO: Gas management
 
         # deploy contracts
-        total_deployment_steps = 0
+        total_deployment_transactions = 0
         for deployer_class in self.deployer_classes:
-            total_deployment_steps += deployer_class.num_deployment_steps
+            total_deployment_transactions += deployer_class.number_of_deployment_transactions
 
-        with click.progressbar(length=total_deployment_steps, label="Deploying Contracts") as bar:
+        with click.progressbar(length=total_deployment_transactions, label="Deploying Contracts") as bar:
             for deployer_class in self.deployer_classes:
                 if interactive:
                     click.pause(info="\nPress any key to continue")

nucypher/blockchain/eth/deployers.py

@@ -38,7 +38,7 @@ class ContractDeployer:
 
     agency = NotImplemented
     contract_name = NotImplemented
-    num_deployment_steps = NotImplemented
+    number_of_deployment_transactions = NotImplemented
     _interface_class = BlockchainDeployerInterface
     _upgradeable = NotImplemented
     __linker_deployer = NotImplemented
@@ -142,7 +142,7 @@ class NucypherTokenDeployer(ContractDeployer):
 
     agency = NucypherTokenAgent
     contract_name = agency.registry_contract_name
-    num_deployment_steps = 1
+    number_of_deployment_transactions = 1
     _upgradeable = False
 
     def __init__(self,
@@ -183,7 +183,7 @@ class DispatcherDeployer(ContractDeployer):
     """
 
     contract_name = DISPATCHER_CONTRACT_NAME
-    num_deployment_steps = 1
+    number_of_deployment_transactions = 1
     _upgradeable = False
 
     DISPATCHER_SECRET_LENGTH = 32
@@ -241,7 +241,7 @@ class StakingEscrowDeployer(ContractDeployer):
 
     agency = StakingEscrowAgent
     contract_name = agency.registry_contract_name
-    num_deployment_steps = 4
+    number_of_deployment_transactions = 4
     _upgradeable = True
     __proxy_deployer = DispatcherDeployer
 
@@ -410,7 +410,7 @@ class PolicyManagerDeployer(ContractDeployer):
 
     agency = PolicyManagerAgent
     contract_name = agency.registry_contract_name
-    num_deployment_steps = 3
+    number_of_deployment_transactions = 3
     _upgradeable = True
     __proxy_deployer = DispatcherDeployer
 
@@ -520,7 +520,7 @@ class PolicyManagerDeployer(ContractDeployer):
 class LibraryLinkerDeployer(ContractDeployer):
 
     contract_name = 'UserEscrowLibraryLinker'
-    num_deployment_steps = 1
+    number_of_deployment_transactions = 1
 
     def __init__(self, target_contract: Contract, bare: bool = False, *args, **kwargs):
         self.target_contract = target_contract
@@ -558,7 +558,7 @@ class LibraryLinkerDeployer(ContractDeployer):
 class UserEscrowProxyDeployer(ContractDeployer):
 
     contract_name = 'UserEscrowProxy'
-    num_deployment_steps = 2
+    number_of_deployment_transactions = 2
     __linker_deployer = LibraryLinkerDeployer
 
     def __init__(self, *args, **kwargs):
@@ -645,7 +645,7 @@ class UserEscrowDeployer(ContractDeployer):
 
     agency = UserEscrowAgent
     contract_name = agency.registry_contract_name
-    num_deployment_steps = 1
+    number_of_deployment_transactions = 1
     _upgradeable = True
     __linker_deployer = LibraryLinkerDeployer
     __allocation_registry = AllocationRegistry
@@ -744,7 +744,7 @@ class AdjudicatorDeployer(ContractDeployer):
 
     agency = AdjudicatorAgent
     contract_name = agency.registry_contract_name
-    num_deployment_steps = 3
+    number_of_deployment_transactions = 3
     _upgradeable = True
     __proxy_deployer = DispatcherDeployer
 

tests/blockchain/eth/entities/deployers/test_adjudicator_deployer.py

@@ -48,7 +48,7 @@ def test_adjudicator_deployer(session_testerchain, slashing_economics, deploymen
 
     assert len(deployment_receipts) == 3
     # deployment steps must match expected number of steps
-    assert deployment_progress.num_steps == deployer.num_deployment_steps
+    assert deployment_progress.num_steps == deployer.number_of_deployment_transactions
 
     for title, receipt in deployment_receipts.items():
         assert receipt['status'] == 1

tests/blockchain/eth/entities/deployers/test_interdeployer_integration.py

@@ -137,7 +137,7 @@ def test_deploy_ethereum_contracts(session_testerchain, deployment_progress):
     assert another_adjudicator_agent.contract_address == adjudicator_deployer.contract_address == adjudicator_agent.contract_address
 
     # overall deployment steps must match aggregated individual expected number of steps
-    assert deployment_progress.num_steps == (token_deployer.num_deployment_steps +
+    assert deployment_progress.num_steps == (token_deployer.number_of_deployment_transactions +
-                                             staking_escrow_deployer.num_deployment_steps +
+                                             staking_escrow_deployer.number_of_deployment_transactions +
-                                             policy_manager_deployer.num_deployment_steps +
+                                             policy_manager_deployer.number_of_deployment_transactions +
-                                             adjudicator_deployer.num_deployment_steps)
+                                             adjudicator_deployer.number_of_deployment_transactions)

tests/blockchain/eth/entities/deployers/test_policy_manager_deployer.py

@@ -42,7 +42,7 @@ def test_policy_manager_deployment(policy_manager_deployer, staking_escrow_deplo
                                                          progress=deployment_progress)
     assert len(deployment_receipts) == 3
     # deployment steps must match expected number of steps
-    assert deployment_progress.num_steps == policy_manager_deployer.num_deployment_steps
+    assert deployment_progress.num_steps == policy_manager_deployer.number_of_deployment_transactions
 
     for title, receipt in deployment_receipts.items():
         assert receipt['status'] == 1

tests/blockchain/eth/entities/deployers/test_staking_escrow_deployer.py

@@ -30,7 +30,7 @@ def test_staking_escrow_deployment(staking_escrow_deployer, deployment_progress)
 
     assert len(deployment_receipts) == 4
     # deployment steps must match expected number of steps
-    assert deployment_progress.num_steps == staking_escrow_deployer.num_deployment_steps
+    assert deployment_progress.num_steps == staking_escrow_deployer.number_of_deployment_transactions
 
     for title, receipt in deployment_receipts.items():
         assert receipt['status'] == 1

tests/blockchain/eth/entities/deployers/test_token_deployer.py

@@ -38,7 +38,7 @@ def test_token_deployer_and_agent(session_testerchain, deployment_progress):
         assert receipt['status'] == 1
 
     # deployment steps must match expected number of steps
-    assert deployment_progress.num_steps == deployer.num_deployment_steps
+    assert deployment_progress.num_steps == deployer.number_of_deployment_transactions
 
     # Create a token instance
     token_agent = deployer.make_agent()

tests/blockchain/eth/entities/deployers/test_user_escrow_deployer.py

@@ -50,7 +50,7 @@ def test_user_escrow_deployer(session_testerchain, session_agency, user_escrow_p
 
     assert len(user_escrow_proxy_receipts) == 2
     # deployment steps must match expected number of steps
-    assert deployment_progress.num_steps == user_escrow_proxy_deployer.num_deployment_steps
+    assert deployment_progress.num_steps == user_escrow_proxy_deployer.number_of_deployment_transactions
 
     for title, receipt in user_escrow_proxy_receipts.items():
         assert receipt['status'] == 1