Simplify store_and_verify_deployment_info_services()

This closes #895.
raiden-network · Apr 29, 2019 · 6669e99 · 6669e99
1 parent d5aef96
commit 6669e99
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 27 deletions.
diff --git a/raiden_contracts/deploy/contract_verifyer.py b/raiden_contracts/deploy/contract_verifyer.py
@@ -76,7 +76,7 @@ def verify_deployed_service_contracts_in_filesystem(
         if deployment_data is None:
             raise RuntimeError(f'Deployment data cannot be found at {deployment_file_path}')
 
-        if self._verify_service_contracts_deployment_data(
+        if self.verify_service_contracts_deployment_data(
                 token_address=token_address,
                 user_deposit_whole_balance_limit=user_deposit_whole_balance_limit,
                 deployment_data=deployment_data,
@@ -99,25 +99,17 @@ def store_and_verify_deployment_info_raiden(
     def store_and_verify_deployment_info_services(
             self,
             deployed_contracts_info: DeployedContracts,
-            save_info: bool,
             token_address: str,
             user_deposit_whole_limit: int,
     ):
-        if save_info:
-            self._store_deployment_info(
-                services=True,
-                deployment_info=deployed_contracts_info,
-            )
-            self.verify_deployed_service_contracts_in_filesystem(
-                token_address=token_address,
-                user_deposit_whole_balance_limit=user_deposit_whole_limit,
-            )
-        else:
-            self._verify_service_contracts_deployment_data(
-                token_address=token_address,
-                user_deposit_whole_balance_limit=user_deposit_whole_limit,
-                deployment_data=deployed_contracts_info,
-            )
+        self._store_deployment_info(
+            services=True,
+            deployment_info=deployed_contracts_info,
+        )
+        self.verify_deployed_service_contracts_in_filesystem(
+            token_address=token_address,
+            user_deposit_whole_balance_limit=user_deposit_whole_limit,
+        )
 
     def _store_deployment_info(
             self,
@@ -235,7 +227,7 @@ def _verify_deployed_contract(
 
         return contract_instance, contracts[contract_name]['constructor_arguments']
 
-    def _verify_service_contracts_deployment_data(
+    def verify_service_contracts_deployment_data(
             self,
             token_address: str,
             user_deposit_whole_balance_limit: int,

diff --git a/raiden_contracts/tests/test_deploy_script.py b/raiden_contracts/tests/test_deploy_script.py
@@ -447,7 +447,7 @@ def test_deploy_script_service(
     deposit_limit = token_supply // 2
 
     deployed_service_contracts = deployed_service_info
-    deployer._verify_service_contracts_deployment_data(
+    deployer.verify_service_contracts_deployment_data(
         token_address=token_address,
         user_deposit_whole_balance_limit=deposit_limit,
         deployment_data=deployed_service_contracts,
@@ -456,7 +456,7 @@ def test_deploy_script_service(
     deployed_info_fail = deepcopy(deployed_service_contracts)
     deployed_info_fail['contracts_version'] = '0.0.0'
     with pytest.raises(RuntimeError):
-        deployer._verify_service_contracts_deployment_data(
+        deployer.verify_service_contracts_deployment_data(
             token_address=token_address,
             user_deposit_whole_balance_limit=deposit_limit,
             deployment_data=deployed_info_fail,
@@ -465,7 +465,7 @@ def test_deploy_script_service(
     deployed_info_fail = deepcopy(deployed_service_contracts)
     deployed_info_fail['chain_id'] = deployed_service_contracts['chain_id'] + 1
     with pytest.raises(RuntimeError):
-        deployer._verify_service_contracts_deployment_data(
+        deployer.verify_service_contracts_deployment_data(
             token_address=token_address,
             user_deposit_whole_balance_limit=deposit_limit,
             deployment_data=deployed_info_fail,
@@ -477,7 +477,7 @@ def test_missing_deployment(contract_name):
             contract_name
         ]['address'] = EMPTY_ADDRESS
         with pytest.raises(AssertionError):
-            deployer._verify_service_contracts_deployment_data(
+            deployer.verify_service_contracts_deployment_data(
                 token_address=token_address,
                 user_deposit_whole_balance_limit=deposit_limit,
                 deployment_data=deployed_info_fail,
@@ -552,16 +552,14 @@ def test_store_and_verify_services(
         version=None,
     ).parent)
     deployed_contracts_info = deployed_service_info
-    deployer.store_and_verify_deployment_info_services(
+    deployer.verify_service_contracts_deployment_data(
         token_address=token_address,
-        deployed_contracts_info=deployed_contracts_info,
-        save_info=False,
-        user_deposit_whole_limit=DEPOSIT_LIMIT,
+        deployment_data=deployed_contracts_info,
+        user_deposit_whole_balance_limit=DEPOSIT_LIMIT,
     )
     deployer.store_and_verify_deployment_info_services(
         token_address=token_address,
         deployed_contracts_info=deployed_contracts_info,
-        save_info=True,
         user_deposit_whole_limit=DEPOSIT_LIMIT,
     )