From 0422d2a021c7d76cc654015e5889a15e8f1081f5 Mon Sep 17 00:00:00 2001
From: Lex Berezhny <lex@damoti.com>
Date: Sun, 29 Mar 2020 19:39:37 -0400
Subject: [PATCH 1/2] estimated timestamp should be integer

---
 lbry/wallet/header.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lbry/wallet/header.py b/lbry/wallet/header.py
index d8ea47665..554782c00 100644
--- a/lbry/wallet/header.py
+++ b/lbry/wallet/header.py
@@ -128,7 +128,7 @@ class Headers:
             raise IndexError(f"failed to get {height}, at {len(self)}")
 
     def estimated_timestamp(self, height):
-        return self.first_block_timestamp + (height * self.timestamp_average_offset)
+        return int(self.first_block_timestamp + (height * self.timestamp_average_offset))
 
     def estimated_julian_day(self, height):
         return date_to_julian_day(date.fromtimestamp(self.estimated_timestamp(height)))

From 151805121c44e91be85ca2a03dfa6dcd35827e3d Mon Sep 17 00:00:00 2001
From: Lex Berezhny <lex@damoti.com>
Date: Sun, 29 Mar 2020 20:00:23 -0400
Subject: [PATCH 2/2] increase wallet server payment test timeout

---
 tests/integration/blockchain/test_wallet_server_sessions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/blockchain/test_wallet_server_sessions.py b/tests/integration/blockchain/test_wallet_server_sessions.py
index f0887ead0..355f98762 100644
--- a/tests/integration/blockchain/test_wallet_server_sessions.py
+++ b/tests/integration/blockchain/test_wallet_server_sessions.py
@@ -81,7 +81,7 @@ class TestUsagePayment(CommandTestCase):
         self.assertEqual(features["payment_address"], address)
         self.assertEqual(features["daily_fee"], "1.1")
         with self.assertRaises(ServerPaymentFeeAboveMaxAllowedError):
-            await asyncio.wait_for(wallet_pay_service.on_payment.first, timeout=3)
+            await asyncio.wait_for(wallet_pay_service.on_payment.first, timeout=8)
 
         await node.stop(False)
         await node.start(self.blockchain, extraconf={"PAYMENT_ADDRESS": address, "DAILY_FEE": "1.0"})