AaronFiore/electrum
1
0
Fork 0
Code Activity

qeconfig: fix btc amount regex, add msat regex property, add regex tests

Browse Source
This commit is contained in:
Sander van Grieken
2025-11-26 16:33:44 +01:00
parent 93c9dd9d12
commit e137c888a1
2 changed files with 83 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
electrum/gui/qml/qeconfig.py
View File

@@ -94,14 +94,22 @@ class QEConfig(AuthMixin, QObject):
@pyqtProperty('QRegularExpression', notify=baseUnitChanged)
def btcAmountRegex(self):
return self._btcAmountRegex()
@pyqtProperty('QRegularExpression', notify=baseUnitChanged)
def btcAmountRegexMsat(self):
return self._btcAmountRegex(3)
def _btcAmountRegex(self, extra_precision: int = 0):
decimal_point = base_unit_name_to_decimal_point(self.config.get_base_unit())
max_digits_before_dp = (
len(str(TOTAL_COIN_SUPPLY_LIMIT_IN_BTC))
+ (base_unit_name_to_decimal_point("BTC") - decimal_point))
exp = '[0-9]{0,%d}' % max_digits_before_dp
exp = '^[0-9]{0,%d}' % max_digits_before_dp
decimal_point += extra_precision
if decimal_point > 0:
exp += '\\.'
exp += '[0-9]{0,%d}' % decimal_point
exp += '(\\.[0-9]{0,%d})?' % decimal_point
exp += '$'
return QRegularExpression(exp)
thousandsSeparatorChanged = pyqtSignal()

72
tests/test_qml_qeconfig.py
View File

@@ -1,7 +1,11 @@
from typing import TYPE_CHECKING
from electrum import SimpleConfig
from electrum.gui.qml.qeconfig import QEConfig
from tests.qt_util import QETestCase, qt_test
if TYPE_CHECKING:
from PyQt6.QtCore import QRegularExpression
class TestConfig(QETestCase):
@classmethod
@@ -64,3 +68,71 @@ class TestConfig(QETestCase):
self.assertFalse(qa.isEmpty)
self.assertEqual(qa.satsInt, 1)
self.assertEqual(qa.msatsInt, 1001)
@qt_test
def test_btc_amount_regexes(self):
self.q.config.BTC_AMOUNTS_DECIMAL_POINT = 8
a: 'QRegularExpression' = self.q.btcAmountRegex
b: 'QRegularExpression' = self.q.btcAmountRegexMsat
self.assertTrue(a.isValid())
self.assertTrue(b.isValid())
self.assertTrue(a.match('1').hasMatch())
self.assertTrue(a.match('1.').hasMatch())
self.assertTrue(a.match('1.00000000').hasMatch())
self.assertFalse(a.match('1.000000000').hasMatch())
self.assertTrue(a.match('21000000').hasMatch())
self.assertFalse(a.match('121000000').hasMatch())
self.assertTrue(b.match('1').hasMatch())
self.assertTrue(b.match('1.').hasMatch())
self.assertTrue(b.match('1.00000000').hasMatch())
self.assertTrue(b.match('1.00000000000').hasMatch())
self.assertFalse(b.match('1.000000000000').hasMatch())
self.assertTrue(b.match('21000000').hasMatch())
self.assertFalse(b.match('121000000').hasMatch())
self.q.config.BTC_AMOUNTS_DECIMAL_POINT = 5
a: 'QRegularExpression' = self.q.btcAmountRegex
b: 'QRegularExpression' = self.q.btcAmountRegexMsat
self.assertTrue(a.isValid())
self.assertTrue(b.isValid())
self.assertTrue(a.match('1').hasMatch())
self.assertTrue(a.match('1.').hasMatch())
self.assertTrue(a.match('1.00000').hasMatch())
self.assertFalse(a.match('1.000000').hasMatch())
self.assertTrue(a.match('21000000000').hasMatch())
self.assertFalse(a.match('121000000000').hasMatch())
self.assertTrue(b.match('1').hasMatch())
self.assertTrue(b.match('1.').hasMatch())
self.assertTrue(b.match('1.0000000').hasMatch())
self.assertTrue(b.match('1.00000000').hasMatch())
self.assertFalse(b.match('1.000000000000').hasMatch())
self.assertTrue(b.match('21000000000').hasMatch())
self.assertFalse(b.match('121000000000').hasMatch())
self.q.config.BTC_AMOUNTS_DECIMAL_POINT = 0
a: 'QRegularExpression' = self.q.btcAmountRegex
b: 'QRegularExpression' = self.q.btcAmountRegexMsat
self.assertTrue(a.isValid())
self.assertTrue(b.isValid())
self.assertTrue(a.match('1').hasMatch())
self.assertFalse(a.match('1.').hasMatch())
self.assertTrue(a.match('2100000000000000').hasMatch())
self.assertFalse(a.match('12100000000000000').hasMatch())
self.assertTrue(b.match('1').hasMatch())
self.assertTrue(b.match('1.').hasMatch())
self.assertTrue(b.match('1.000').hasMatch())
self.assertFalse(b.match('1.0000').hasMatch())
self.assertTrue(b.match('2100000000000000').hasMatch())
self.assertFalse(b.match('12100000000000000').hasMatch())