electrum

commit 8bb59fcc3c235d971df9669afc1d7ac5a226e6ba
parent b8ab36546dad3b0774222b1f2e0bf61628c0d490
Author: SomberNight <somber.night@protonmail.com>
Date:   Sat, 14 Jul 2018 18:54:27 +0200

follow-up prev: fix bug in fee_to_depth, and typo and tests

Diffstat:
M
electrum/simple_config.py
 | 
4
+---
M
electrum/tests/test_simple_config.py
 | 
5
+++--

2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/electrum/simple_config.py b/electrum/simple_config.py
@@ -321,8 +321,6 @@ class SimpleConfig(PrintError):
             depth += s
             if fee <= target_fee:
                 break
-        else:
-            return 0
         return depth
 
     def depth_to_fee(self, slider_pos) -> int:
@@ -333,7 +331,7 @@ class SimpleConfig(PrintError):
     @impose_hard_limits_on_fee
     def depth_target_to_fee(self, target: int) -> int:
         """Returns fee in sat/kbyte.
-        target: desired mempool depth in sat/vbyte
+        target: desired mempool depth in vbytes
         """
         depth = 0
         for fee, s in self.mempool_fees:
diff --git a/electrum/tests/test_simple_config.py b/electrum/tests/test_simple_config.py
@@ -111,7 +111,7 @@ class Test_SimpleConfig(SequentialTestCase):
         self.assertEqual({"something": "a"}, result)
 
     def test_depth_target_to_fee(self):
-        config = SimpleConfig({})
+        config = SimpleConfig(self.options)
         config.mempool_fees = [[49, 100110], [10, 121301], [6, 153731], [5, 125872], [1, 36488810]]
         self.assertEqual( 2 * 1000, config.depth_target_to_fee(1000000))
         self.assertEqual( 6 * 1000, config.depth_target_to_fee( 500000))
@@ -134,7 +134,7 @@ class Test_SimpleConfig(SequentialTestCase):
         self.assertEqual( 1 * 1000, config.depth_target_to_fee(10 ** 8))
 
     def test_fee_to_depth(self):
-        config = SimpleConfig({})
+        config = SimpleConfig(self.options)
         config.mempool_fees = [[49, 100000], [10, 120000], [6, 150000], [5, 125000], [1, 36000000]]
         self.assertEqual(100000, config.fee_to_depth(500))
         self.assertEqual(100000, config.fee_to_depth(50))
@@ -145,6 +145,7 @@ class Test_SimpleConfig(SequentialTestCase):
         self.assertEqual(370000, config.fee_to_depth(6.5))
         self.assertEqual(370000, config.fee_to_depth(6))
         self.assertEqual(495000, config.fee_to_depth(5.5))
+        self.assertEqual(36495000, config.fee_to_depth(0.5))
 
 
 class TestUserConfig(SequentialTestCase):