Merge pull request #159 from lbryio/rename-abandon-name

Include unconfirmed balance and rename abandon_name

lbrynet/core/LBRYWallet.py

@@ -1235,8 +1235,7 @@ class LBRYumWallet(LBRYWallet):
         accounts = None
         exclude_claimtrietx = True
         d = threads.deferToThread(func, accounts, exclude_claimtrietx)
-        d.addCallback(lambda result: result['confirmed'])
-        d.addCallback(Decimal)
+        d.addCallback(lambda result: Decimal(result['confirmed']) + Decimal(result.get('unconfirmed', 0.0)))
         return d
 
     def get_new_address(self):

lbrynet/lbrynet_daemon/LBRYDaemon.py

@@ -389,8 +389,6 @@ class LBRYDaemon(jsonrpc.JSONRPC):
 
     def _responseFailed(self, err, call):
         log.debug(err.getTraceback())
-        if call.active():
-            call.cancel()
 
     def render(self, request):
         request.content.seek(0, 0)
@@ -2018,7 +2016,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
 
         return d
 
-    def jsonrpc_abandon_name(self, p):
+    def jsonrpc_abandon_claim(self, p):
         """
         Abandon a name and reclaim credits from the claim