Merge branch 'develop'

kyuupichan · Jan 17, 2017 · 9f106e2 · 9f106e2
2 parents 8b8de42 + b03a44c
commit 9f106e2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/README.rst b/README.rst
@@ -137,6 +137,12 @@ version prior to the release of 1.0.
 ChangeLog
 =========
 
+Version 0.10.8
+--------------
+
+* fix import for reverse iterator for RocksDB
+* fix tests
+
 Version 0.10.7
 --------------
 

diff --git a/server/storage.py b/server/storage.py
@@ -10,11 +10,11 @@
 import os
 from functools import partial
 
-from lib.util import subclasses, increment_byte_string
+import lib.util as util
 
 def db_class(name):
     '''Returns a DB engine class.'''
-    for db_class in subclasses(Storage):
+    for db_class in util.subclasses(Storage):
         if db_class.__name__.lower() == name.lower():
             db_class.import_module()
             return db_class

diff --git a/server/version.py b/server/version.py
@@ -1 +1 @@
-VERSION = "ElectrumX 0.10.7"
+VERSION = "ElectrumX 0.10.8"
diff --git a/tests/test_util.py b/tests/test_util.py
@@ -56,4 +56,4 @@ def test_chunks():
 def test_increment_byte_string():
     assert util.increment_byte_string(b'1') == b'2'
     assert util.increment_byte_string(b'\x01\x01') == b'\x01\x02'
-    assert util.increment_byte_string(b'\xff\xff') == b'\x01\x00\x00'
+    assert util.increment_byte_string(b'\xff\xff') == None