From 893b4fc3ca4d77e123dd0318562e26ba44f69e5f Mon Sep 17 00:00:00 2001
From: Lex Berezhny <lex@damoti.com>
Date: Mon, 7 Jan 2019 16:49:01 -0500
Subject: [PATCH] fixes

---
 lbrynet/extras/reflector/client/client.py  | 2 +-
 lbrynet/extras/wallet/manager.py           | 5 ++---
 lbrynet/p2p/server/ServerRequestHandler.py | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lbrynet/extras/reflector/client/client.py b/lbrynet/extras/reflector/client/client.py
index 6e00004b6..49be58b9a 100644
--- a/lbrynet/extras/reflector/client/client.py
+++ b/lbrynet/extras/reflector/client/client.py
@@ -303,7 +303,7 @@ class EncryptedFileReflectorClient(Protocol):
             # open the next blob to send
             blob_hash = self.blob_hashes_to_send[0]
             self.blob_hashes_to_send = self.blob_hashes_to_send[1:]
-            d = self.blob_manager.get_blob(blob_hash)
+            d = defer.succeed(self.blob_manager.get_blob(blob_hash))
             d.addCallback(self.open_blob_for_reading)
             d.addCallbacks(lambda _: self.send_blob_info(),
                            lambda err: self.skip_missing_blob(err, blob.blob_hash))
diff --git a/lbrynet/extras/wallet/manager.py b/lbrynet/extras/wallet/manager.py
index 1517b6ac6..322456711 100644
--- a/lbrynet/extras/wallet/manager.py
+++ b/lbrynet/extras/wallet/manager.py
@@ -1,6 +1,5 @@
 import os
 import json
-import asyncio
 import logging
 from binascii import unhexlify
 
@@ -15,6 +14,7 @@ from torba.rpc.jsonrpc import CodeMessageError
 
 from lbrynet.schema.claim import ClaimDict
 
+from lbrynet.extras.compat import f2d
 from lbrynet.extras.wallet.ledger import MainNetLedger
 from lbrynet.extras.wallet.account import BaseAccount, generate_certificate
 from lbrynet.extras.wallet.transaction import Transaction
@@ -611,8 +611,7 @@ class LBRYcrdAddressQueryHandler:
     @defer.inlineCallbacks
     def handle_queries(self, queries):
         if self.query_identifiers[0] in queries:
-            future = self.wallet.get_unused_address_for_peer(self.peer)
-            address = yield defer.Deferred.fromFuture(asyncio.ensure_future(future))
+            address = yield f2d(self.wallet.get_unused_address_for_peer(self.peer))
             self.address = address
             fields = {'lbrycrd_address': address}
             return fields
diff --git a/lbrynet/p2p/server/ServerRequestHandler.py b/lbrynet/p2p/server/ServerRequestHandler.py
index 9f6f04010..b969515c2 100644
--- a/lbrynet/p2p/server/ServerRequestHandler.py
+++ b/lbrynet/p2p/server/ServerRequestHandler.py
@@ -167,7 +167,7 @@ class ServerRequestHandler:
         ds = []
         for query_handler, query_identifiers in self.query_handlers.items():
             queries = {q_i: msg[q_i] for q_i in query_identifiers if q_i in msg}
-            d = defer.succeed(query_handler.handle_queries(queries))
+            d = defer.maybeDeferred(query_handler.handle_queries(queries))
             d.addErrback(log_errors)
             ds.append(d)