Merge pull request #4782 from golemfactory/bugfix-concent-acceptance-…

…payment-tests

Extend blockchain sleep to 120 seconds

scripts/concent_acceptance_tests/base.py

@@ -95,8 +95,8 @@ def requestor_pub_key(self):
     def ttc_add_promissory_and_sign(self, ttc, priv_key=None) -> None:
         priv_key = priv_key or self.requestor_priv_key
         ttc.sign_all_promissory_notes(
-            deposit_contract_address=
-            self.ethereum_config.deposit_contract_address,
+            deposit_contract_address=self.ethereum_config
+            .deposit_contract_address,
             private_key=priv_key,
         )
         ttc.sign_message(priv_key)
@@ -229,7 +229,7 @@ def assertServiceRefused(
             self,
             msg: concents.ServiceRefused,
             reason=None,
-        ):
+    ):
         self.assertIsInstance(msg, concents.ServiceRefused)
         if reason:
             self.assertEqual(msg.reason, reason)
@@ -402,7 +402,7 @@ def deposit_confirmed(_):
 
         if sci.get_deposit_value(sci.get_eth_address()) < amount:
             raise RuntimeError("Deposit failed")
-        self.blockchain_sleep(120)
+        self.blockchain_sleep()
         dump_balance(sci)
 
     def requestor_put_deposit(self, price: int):
@@ -416,7 +416,7 @@ def provider_put_deposit(self, price: int):
         amount, _ = helpers.provider_deposit_amount(price)
         return self.put_deposit(self.provider_sci, amount)
 
-    @staticmethod
-    def blockchain_sleep(sleep_time=60):
+    def blockchain_sleep(self):
+        sleep_time = 15*self.requestor_sci.REQUIRED_CONFS+10
         sys.stderr.write(f'Going to sleep for: {sleep_time} seconds...\n')
         time.sleep(sleep_time)