AaronFiore/electrum
1
0
Fork 0
Code Activity

util.format_satoshis: fix whitespaces param for non-zero precision

Browse Source
This commit is contained in:
SomberNight
2021-07-20 20:31:48 +02:00
parent 5c80293696
commit 46badd128e
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
electrum/tests/test_util.py
View File

@@ -52,16 +52,16 @@ class TestUtil(ElectrumTestCase):
format_fee_satoshis(1666/1000, precision=1)) format_fee_satoshis(1666/1000, precision=1))
def test_format_satoshis_whitespaces(self): def test_format_satoshis_whitespaces(self):
self.assertEqual(" 0.0001234 ", self.assertEqual(" 0.0001234 ", format_satoshis(12340, whitespaces=True))
format_satoshis(12340, whitespaces=True)) self.assertEqual(" 0.00001234", format_satoshis(1234, whitespaces=True))
self.assertEqual(" 0.00001234", self.assertEqual(" 0.45831275", format_satoshis(Decimal("45831275."), whitespaces=True))
format_satoshis(1234, whitespaces=True)) self.assertEqual(" 0.45831275 ", format_satoshis(Decimal("45831275."), whitespaces=True, precision=3))
self.assertEqual(" 0.458312757 ", format_satoshis(Decimal("45831275.7"), whitespaces=True, precision=3))
self.assertEqual(" 0.45831275748", format_satoshis(Decimal("45831275.748"), whitespaces=True, precision=3))
def test_format_satoshis_whitespaces_negative(self): def test_format_satoshis_whitespaces_negative(self):
self.assertEqual(" -0.0001234 ", self.assertEqual(" -0.0001234 ", format_satoshis(-12340, whitespaces=True))
format_satoshis(-12340, whitespaces=True)) self.assertEqual(" -0.00001234", format_satoshis(-1234, whitespaces=True))
self.assertEqual(" -0.00001234",
format_satoshis(-1234, whitespaces=True))
def test_format_satoshis_diff_positive(self): def test_format_satoshis_diff_positive(self):
self.assertEqual("+0.00001234", format_satoshis(1234, is_diff=True)) self.assertEqual("+0.00001234", format_satoshis(1234, is_diff=True))

9
electrum/util.py
View File

@@ -677,10 +677,13 @@ def format_satoshis(
if len(fract_part) < num_zeros: if len(fract_part) < num_zeros:
fract_part += "0" * (num_zeros - len(fract_part)) fract_part += "0" * (num_zeros - len(fract_part))
result = integer_part + DECIMAL_POINT + fract_part result = integer_part + DECIMAL_POINT + fract_part
# add leading/trailing whitespaces # add leading/trailing whitespaces so that numbers can be aligned in a column
if whitespaces: if whitespaces:
result += " " * (decimal_point - len(fract_part)) # add trailing whitespaces
result = " " * (15 - len(result)) + result result += " " * (overall_precision - len(fract_part))
# add leading whitespaces
target_len = 15 + precision
result = " " * (target_len - len(result)) + result
return result return result