Merge pull request #4422 from golemfactory/mwu/no-genesis

Use last confirmed block instead of genesis with new eth account
golemfactory · Jul 4, 2019 · 17ad819 · 17ad819
2 parents 69da3ce + 81cd523
commit 17ad819
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/golem/ethereum/transactionsystem.py b/golem/ethereum/transactionsystem.py
@@ -278,7 +278,8 @@ def _subscribe_to_events(self) -> None:
         self._sci: SmartContractsInterface
         values = model.GenericKeyValue.select().where(
             model.GenericKeyValue.key == self.BLOCK_NUMBER_DB_KEY)
-        from_block = int(values.get().value) if values.count() == 1 else 0
+        from_block = int(values.get().value) if values.count() == 1 else \
+            self._sci.get_latest_confirmed_block_number()
 
         ik = self._incomes_keeper
         self._sci.subscribe_to_batch_transfers(

diff --git a/tests/golem/ethereum/test_transactionsystem.py b/tests/golem/ethereum/test_transactionsystem.py
@@ -278,7 +278,7 @@ def test_subscriptions(self):
         self.sci.subscribe_to_batch_transfers.assert_called_once_with(
             None,
             self.sci.get_eth_address(),
-            0,
+            self.sci.get_latest_confirmed_block_number(),
             ANY,
         )
-Original file line number
+Diff line change
@@ Expand Up / @@ -278,7 +278,7 @@ def test_subscriptions(self): @@
             self.sci.subscribe_to_batch_transfers.assert_called_once_with(
                 None,
                 self.sci.get_eth_address(),
-,
+                self.sci.get_latest_confirmed_block_number(),
                 ANY,
             )
@@ Expand Down @@