From e56b72cf04845053d38441c01e59b2baeedf6e1f Mon Sep 17 00:00:00 2001
From: Lex Berezhny <lex@damoti.com>
Date: Sat, 18 May 2019 00:10:24 -0400
Subject: [PATCH] pylint and use torba master

---
 .travis.yml                 | 8 ++++----
 lbrynet/wallet/server/db.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a373835b6..afe118576 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ jobs:
       name: "pylint lbrynet"
       install:
         - pip install astroid pylint
-        - pip install git+https://github.com/lbryio/torba.git@sqltrie#egg=torba
+        - pip install git+https://github.com/lbryio/torba.git@master#egg=torba
         - pip install -e .
       script: pylint lbrynet
 
@@ -18,7 +18,7 @@ jobs:
       name: "Unit Tests"
       install:
         - pip install coverage
-        - pip install git+https://github.com/lbryio/torba.git@sqltrie#egg=torba
+        - pip install git+https://github.com/lbryio/torba.git@master#egg=torba
         - pip install -e .
       script:
         - HOME=/tmp coverage run -p --source=lbrynet -m unittest discover -vv tests.unit
@@ -30,7 +30,7 @@ jobs:
       cache: false
       install:
         - pip install tox-travis coverage
-        - pushd .. && git clone --single-branch --branch sqltrie https://github.com/lbryio/torba.git && popd
+        - pushd .. && git clone --single-branch --branch master https://github.com/lbryio/torba.git && popd
       script: tox
       after_success:
         - coverage combine tests/
@@ -39,7 +39,7 @@ jobs:
     - name: "Run Examples"
       install:
         - pip install coverage
-        - pip install git+https://github.com/lbryio/torba.git@sqltrie#egg=torba
+        - pip install git+https://github.com/lbryio/torba.git@master#egg=torba
         - pip install -e .
       script:
         - HOME=/tmp coverage run -p --source=lbrynet scripts/generate_json_api.py
diff --git a/lbrynet/wallet/server/db.py b/lbrynet/wallet/server/db.py
index 54e6b6571..87a11dfe6 100644
--- a/lbrynet/wallet/server/db.py
+++ b/lbrynet/wallet/server/db.py
@@ -503,7 +503,7 @@ class SQLDB:
                 column = order_by[1:] if is_asc else order_by
                 if column not in self.ORDER_FIELDS:
                     raise NameError(f'{column} is not a valid order_by field')
-                elif column == 'name':
+                if column == 'name':
                     column = 'normalized'
                 sql_order_by.append(
                     f"claim.{column} ASC" if is_asc else f"claim.{column} DESC"