AaronFiore/electrum
1
0
Fork 0
Code Activity

fix #4771

Browse Source
This commit is contained in:
SomberNight
2018-10-13 04:22:53 +02:00
parent 5afdc14913
commit 7c4d6c6801
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
electrum/tests/test_util.py
View File

@@ -13,9 +13,12 @@ class TestUtil(SequentialTestCase):
def test_format_satoshis_negative(self): def test_format_satoshis_negative(self):
self.assertEqual("-0.00001234", format_satoshis(-1234)) self.assertEqual("-0.00001234", format_satoshis(-1234))
def test_format_fee(self): def test_format_fee_float(self):
self.assertEqual("1.7", format_fee_satoshis(1700/1000)) self.assertEqual("1.7", format_fee_satoshis(1700/1000))
def test_format_fee_decimal(self):
self.assertEqual("1.7", format_fee_satoshis(Decimal("1.7")))
def test_format_fee_precision(self): def test_format_fee_precision(self):
self.assertEqual("1.666", self.assertEqual("1.666",
format_fee_satoshis(1666/1000, precision=6)) format_fee_satoshis(1666/1000, precision=6))

2
electrum/util.py
View File

@@ -514,7 +514,7 @@ def format_satoshis(x, num_zeros=0, decimal_point=8, precision=None, is_diff=Fal
if precision is None: if precision is None:
precision = decimal_point precision = decimal_point
# format string # format string
decimal_format = ".0" + str(precision) if precision > 0 else "" decimal_format = "." + str(precision) if precision > 0 else ""
if is_diff: if is_diff:
decimal_format = '+' + decimal_format decimal_format = '+' + decimal_format
# initial result # initial result