From 91323a21cfa509a4f0f4ea0dcfd658c390a7e4f8 Mon Sep 17 00:00:00 2001
From: Victor Shyba <victor.shyba@gmail.com>
Date: Sat, 13 Mar 2021 02:31:03 -0300
Subject: [PATCH] add hub_timeout and propagate it to network code

---
 lbry/conf.py                                 |   1 +
 lbry/wallet/__init__.pyc                     | Bin 0 -> 1268 bytes
 lbry/wallet/manager.py                       |   2 ++
 lbry/wallet/network.py                       |   1 +
 lbry/wallet/orchstr8/node.py                 |   1 +
 tests/integration/blockchain/test_network.py |  10 ++++++++++
 6 files changed, 15 insertions(+)
 create mode 100644 lbry/wallet/__init__.pyc

diff --git a/lbry/conf.py b/lbry/conf.py
index 96b4b4389..5edbd4108 100644
--- a/lbry/conf.py
+++ b/lbry/conf.py
@@ -628,6 +628,7 @@ class Config(CLIConfig):
     # protocol timeouts
     download_timeout = Float("Cumulative timeout for a stream to begin downloading before giving up", 30.0)
     blob_download_timeout = Float("Timeout to download a blob from a peer", 30.0)
+    hub_timeout = Float("Timeout when making a hub request", 30.0)
     peer_connect_timeout = Float("Timeout to establish a TCP connection to a peer", 3.0)
     node_rpc_timeout = Float("Timeout when making a DHT request", constants.RPC_TIMEOUT)
 
diff --git a/lbry/wallet/__init__.pyc b/lbry/wallet/__init__.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d4854844fe6b60a10a9b0972d81a6424f412ff41
GIT binary patch
literal 1268
zcmZ8g+in{-5IyomzRI`wQahJAP9OB*RRaVGPy|JrIDmsVPC^MN%9q7@$x1}XU4cv4
zaeuOZ(I3cjfzFUh>_o)Qa?ad#&WvV1cb5PC=fAwf^fyEA-{@)30u&%gwjf(jGmtY-
zvyih;bC7dT^H6QrdAK%Y8*Tw|0d5g;5pD@`2`%<mfL(@Lfm})YBJ3($2eOm&CD=8%
zb;xzN4ag0+O~_5SEy%6pu?%|$ZX0qNZU=G)ZWnSFZVz%Vd91+x0Jjgh4|f200CyMi
zZnCYy-h;ajc^~cp<b#BEV1I-=ggk_M2>CFfYp_Rfk02kBzK(u(gO~`5B<zL1F1=FC
z%8hbdS`$b`GaxYvVch)E>kUm9O)j#sc0CR<b$n55&ugoTMmIfGUsbj)RPXZV?D4bg
zN%r)M&#^Vt<kRuvXHTAHf17c0G_96h71rvIHQHZlPsvS{oxOM|^l+e?U}#k6&XEXh
z5`RSB(D{1phuRlI9d-#B7)KF>8*BC6>%X+uRY|})nO>d06o0-S<nPY&lh^$>UCw$d
z%iE%&BtF3lWINa4s`ejm3ZH334l!i<Ww#LiP>Pr$OzaC=mmg2H8IHoMOI?MOh%^6Q
zmi43xVU6!fdEGSA>S2kXzNv;*ztPuWpR`k>ec{WIDGPg|gZ9o;hDa&9vt$iCuz@eC
zrYM7{tH{v1Nf=K;m?zWgif&!r`mjnOS^A|n;}AomJ?Y7d^YuTRnV{dAPo|37aZ-fh
zf<}A8&8aSw_RV?sC(g|5=6O{sovT8-y2|rdZHmzzeG6Qe?>r{nk_S&T&ztdOS_49O
z+-Wrgw;;G<!HXccx4>MwG&aGm5vbDG1RG-l8^<Pi%>~mdmRWG0(Z5K;5KNEYPY^s7
z!97KW!VS5C$0{~iY_XYZHjztlhrw+IxsI9=CUzL+y^Ox2$eP$Ay-Uw6(J;pUr(SBe
qm*+I)kmuR>I%a(CYBjO?S6<rYfJD1RXNJ#FYlF@aoqMfaI{yP;Um`02

literal 0
HcmV?d00001

diff --git a/lbry/wallet/manager.py b/lbry/wallet/manager.py
index 3dd99f227..1904f303a 100644
--- a/lbry/wallet/manager.py
+++ b/lbry/wallet/manager.py
@@ -183,6 +183,7 @@ class WalletManager:
         ledger_config = {
             'auto_connect': True,
             'explicit_servers': [],
+            'hub_timeout': config.hub_timeout,
             'default_servers': config.lbryum_servers,
             'known_hubs': config.known_hubs,
             'jurisdiction': config.jurisdiction,
@@ -236,6 +237,7 @@ class WalletManager:
             'default_servers': Config.lbryum_servers.default,
             'known_hubs': self.config.known_hubs,
             'jurisdiction': self.config.jurisdiction,
+            'hub_timeout': self.config.hub_timeout,
             'data_path': self.config.wallet_dir,
         }
         if Config.lbryum_servers.is_set(self.config):
diff --git a/lbry/wallet/network.py b/lbry/wallet/network.py
index 7367a87e3..955cbcb22 100644
--- a/lbry/wallet/network.py
+++ b/lbry/wallet/network.py
@@ -294,6 +294,7 @@ class Network:
                     (pong.country_name != self.jurisdiction):
                 continue
             client = ClientSession(network=self, server=(host, port))
+            client = ClientSession(network=self, server=(host, port), timeout=self.config['hub_timeout'])
             try:
                 await client.create_connection()
                 log.warning("Connected to spv server %s:%i", host, port)
diff --git a/lbry/wallet/orchstr8/node.py b/lbry/wallet/orchstr8/node.py
index ed634628c..9ae8cfc8d 100644
--- a/lbry/wallet/orchstr8/node.py
+++ b/lbry/wallet/orchstr8/node.py
@@ -136,6 +136,7 @@ class WalletNode:
                     'default_servers': Config.lbryum_servers.default,
                     'data_path': self.data_path,
                     'known_hubs': config.known_hubs if config else KnownHubsList()
+                    'hub_timeout': 30,
                 }
             },
             'wallets': [wallet_file_name]
diff --git a/tests/integration/blockchain/test_network.py b/tests/integration/blockchain/test_network.py
index 3f6e9e2d0..886c234a7 100644
--- a/tests/integration/blockchain/test_network.py
+++ b/tests/integration/blockchain/test_network.py
@@ -9,6 +9,7 @@ from lbry.wallet.orchstr8.node import SPVNode
 from lbry.wallet.rpc import RPCSession
 from lbry.wallet.server.udp import StatusServer
 from lbry.testcase import IntegrationTestCase, AsyncioTestCase
+from lbry.conf import Config
 
 
 class NetworkTests(IntegrationTestCase):
@@ -138,6 +139,15 @@ class ReconnectTests(IntegrationTestCase):
         await self.ledger.network.on_connected.first
         self.assertTrue(self.ledger.network.is_connected)
 
+    async def test_timeout_propagated_from_config(self):
+        conf = Config()
+        self.assertEqual(self.ledger.network.client.timeout, 30)
+        conf.hub_timeout = 123.0
+        conf.lbryum_servers = self.ledger.config['default_servers']
+        self.manager.config = conf
+        await self.manager.reset()
+        self.assertEqual(self.ledger.network.client.timeout, 123)
+
     # async def test_online_but_still_unavailable(self):
     #     # Edge case. See issue #2445 for context
     #     self.assertIsNotNone(self.ledger.network.session_pool.fastest_session)