From 757fb51415a948eac02d3a0a5d090c4efd35959c Mon Sep 17 00:00:00 2001
From: Victor Shyba <victor1984@riseup.net>
Date: Fri, 20 Dec 2019 13:04:21 -0300
Subject: [PATCH] make block_expected public

---
 lbry/lbry/testcase.py                          | 2 +-
 lbry/tests/integration/test_resolve_command.py | 2 +-
 torba/torba/orchstr8/node.py                   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lbry/lbry/testcase.py b/lbry/lbry/testcase.py
index 28a5d5dce..0d6355a35 100644
--- a/lbry/lbry/testcase.py
+++ b/lbry/lbry/testcase.py
@@ -223,7 +223,7 @@ class CommandTestCase(IntegrationTestCase):
         if confirm:
             await self.ledger.wait(tx)
             await self.generate(1)
-            await self.ledger.wait(tx, self.blockchain._block_expected)
+            await self.ledger.wait(tx, self.blockchain.block_expected)
         return self.sout(tx)
 
     def create_upload_file(self, data, prefix=None, suffix=None):
diff --git a/lbry/tests/integration/test_resolve_command.py b/lbry/tests/integration/test_resolve_command.py
index ca367ce2b..fe5d6f80a 100644
--- a/lbry/tests/integration/test_resolve_command.py
+++ b/lbry/tests/integration/test_resolve_command.py
@@ -265,7 +265,7 @@ class ResolveAfterReorg(BaseResolveTestCase):
 
     async def reorg(self, start):
         blocks = self.ledger.headers.height - start
-        self.blockchain._block_expected = start - 1
+        self.blockchain.block_expected = start - 1
         # go back to start
         await self.blockchain.invalidate_block(self.ledger.headers.hash(start).decode())
         # go to previous + 1
diff --git a/torba/torba/orchstr8/node.py b/torba/torba/orchstr8/node.py
index f50d9de2e..3cb963669 100644
--- a/torba/torba/orchstr8/node.py
+++ b/torba/torba/orchstr8/node.py
@@ -281,7 +281,7 @@ class BlockchainNode:
         self.data_path = None
         self.protocol = None
         self.transport = None
-        self._block_expected = 0
+        self.block_expected = 0
         self.hostname = 'localhost'
         self.peerport = 9246 + 2  # avoid conflict with default peer port
         self.rpcport = 9245 + 2  # avoid conflict with default rpc port
@@ -294,7 +294,7 @@ class BlockchainNode:
         return f'http://{self.rpcuser}:{self.rpcpassword}@{self.hostname}:{self.rpcport}/'
 
     def is_expected_block(self, e: BlockHeightEvent):
-        return self._block_expected == e.height
+        return self.block_expected == e.height
 
     @property
     def exists(self):
@@ -383,7 +383,7 @@ class BlockchainNode:
         return out.decode().strip()
 
     def generate(self, blocks):
-        self._block_expected += blocks
+        self.block_expected += blocks
         return self._cli_cmnd('generate', str(blocks))
 
     def invalidate_block(self, blockhash):