AaronFiore/electrum
1
0
Fork 0
Code Activity

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

Browse Source
This commit is contained in:
SomberNight
2018-07-14 18:54:27 +02:00
parent b8ab36546d
commit 8bb59fcc3c
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/simple_config.py
View File

@@ -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:

5
electrum/tests/test_simple_config.py
View File

@@ -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):